Skip to content

Commit 1c90a6a

Browse files
committed
去除所有的 compile 关键字
1 parent 3ef8bba commit 1c90a6a

File tree

10 files changed

+30
-67
lines changed

10 files changed

+30
-67
lines changed

app/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,9 @@ kapt {
120120
}
121121

122122
dependencies {
123+
kapt "org.androidannotations:androidannotations:$AAVersion"
123124

124125
implementation project(':common-third-library')
125-
// kapt 'com.android.databinding:compiler:3.1.0'
126-
kapt "org.androidannotations:androidannotations:$AAVersion"
127-
implementation "org.androidannotations:androidannotations-api:$AAVersion"
128-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"
129126
implementation project(':push-coding')
130127
implementation project(':push-xiaomi')
131128
implementation project(':widget-pick-photo')

common-coding/build.gradle

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ android {
3838
}
3939

4040
dependencies {
41-
4241
annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
4342
api "org.androidannotations:androidannotations-api:$AAVersion"
4443

@@ -49,25 +48,8 @@ dependencies {
4948
api files('libs/android-viewbadger.jar')
5049
api files('libs/pinyin4j-2.5.0.jar')
5150

52-
// 方便显示 view 显示一些样式,不用写 selector
53-
api 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
54-
// 列表控件,
55-
api 'com.marshalchen.ultimaterecyclerview:library:0.7.3'
56-
// 文件下载
57-
api 'com.liulishuo.filedownloader:library:1.4.3'
58-
api 'org.greenrobot:eventbus:3.0.0'
59-
api 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
60-
61-
api 'pl.droidsonroids.gif:android-gif-drawable:1.1.11'
62-
63-
implementation project(':luban')
64-
65-
/*
66-
* 提供给子模块公用
67-
*/
68-
6951
implementation project(':common-third-library')
70-
52+
implementation project(':luban')
7153
}
7254

7355
repositories {

common-third-library/build.gradle

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
apply plugin: 'com.android.library'
22

3+
apply plugin: 'kotlin-android'
4+
apply plugin: 'kotlin-android-extensions'
5+
apply plugin: "kotlin-allopen"
6+
apply plugin: "kotlin-kapt"
7+
38
android {
49
compileSdkVersion 27
510

@@ -24,10 +29,9 @@ android {
2429
def AAVersion = '4.4.0'
2530

2631
dependencies {
27-
28-
29-
annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
32+
kapt "org.androidannotations:androidannotations:$AAVersion"
3033
api "org.androidannotations:androidannotations-api:$AAVersion"
34+
api "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"
3135

3236
// 测试框架
3337
implementation "com.android.support:support-annotations:$supportVersion"
@@ -46,6 +50,8 @@ dependencies {
4650
api 'pl.droidsonroids.gif:android-gif-drawable:1.1.11'
4751
api 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
4852
api 'com.github.lzyzsd:circleprogress:1.1.0@aar'
53+
// 方便显示 view 显示一些样式,不用写 selector
54+
api 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
4955

5056
// google 兼容库
5157
def supportVersion = '27.1.1'
@@ -77,4 +83,13 @@ dependencies {
7783
api 'com.blankj:utilcode:1.9.0'
7884
// 打印 log
7985
api 'com.orhanobut:logger:1.15'
86+
87+
api 'org.greenrobot:eventbus:3.0.0'
88+
89+
// 列表控件,
90+
api 'com.marshalchen.ultimaterecyclerview:library:0.7.3'
91+
// 文件下载
92+
api 'com.liulishuo.filedownloader:library:1.4.3'
93+
94+
8095
}

luban/build.gradle

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
apply plugin: 'com.android.library'
22

3-
//buildscript {
4-
// repositories {
5-
// jcenter()
6-
// }
7-
// dependencies {
8-
// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
9-
// }
10-
//}
11-
123
android {
134
compileSdkVersion 27
145
buildToolsVersion '27.0.3'
@@ -28,7 +19,5 @@ android {
2819
}
2920

3021
dependencies {
31-
compile fileTree(dir: 'libs', include: ['*.jar'])
32-
testCompile 'junit:junit:4.12'
33-
implementation "com.android.support:appcompat-v7:$supportVersion"
22+
implementation project(':common-third-library')
3423
}

pay-coding/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,9 @@ android {
2525

2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
2928
implementation "com.android.support:appcompat-v7:$supportVersion"
3029
testImplementation 'junit:junit:4.12'
31-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
32-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
3330

3431
// 微信支付
35-
compile 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:1.4.0'
32+
api 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:1.4.0'
3633
}

push-coding/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,11 @@ android {
2525

2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
2928
implementation "com.android.support:appcompat-v7:$supportVersion"
3029
testImplementation 'junit:junit:4.12'
3130
androidTestImplementation 'com.android.support.test:runner:1.0.1'
3231
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
33-
34-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
35-
32+
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
3633
implementation project(':push-xiaomi')
3734
implementation project(':push-huawei')
3835
}

push-huawei/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,9 @@ dependencies {
4444
testImplementation 'junit:junit:4.12'
4545
androidTestImplementation 'com.android.support.test:runner:1.0.1'
4646
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
47-
compile 'org.greenrobot:eventbus:3.0.0'
48-
49-
compile 'com.huawei.android.hms:push:2.5.2.300'
50-
51-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
47+
api 'org.greenrobot:eventbus:3.0.0'
48+
api 'com.huawei.android.hms:push:2.5.2.300'
49+
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
5250

5351
implementation project(':push-xiaomi')
5452

push-xiaomi/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ dependencies {
4646
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
4747
implementation files('libs/MiPush_SDK_Client_3_5_1.jar')
4848

49-
compile 'org.greenrobot:eventbus:3.0.0'
50-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
49+
api 'org.greenrobot:eventbus:3.0.0'
50+
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
5151
}
5252
repositories {
5353
mavenCentral()

terminal-coding/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ android {
5050
}
5151

5252
dependencies {
53-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
54-
testImplementation 'junit:junit:4.12'
55-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
56-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
57-
58-
implementation "com.android.support:appcompat-v7:$supportVersion"
59-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
60-
61-
6253
implementation project(':common-third-library')
6354
implementation project(':common-coding')
6455
}

widget-pick-photo/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,10 @@ allOpen {
5858

5959
dependencies {
6060
// 生成 R2
61-
compile 'com.jakewharton:butterknife:8.8.1'
61+
implementation 'com.jakewharton:butterknife:8.8.1'
6262
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
6363

6464
kapt "org.androidannotations:androidannotations:$AAVersion"
65-
implementation "org.androidannotations:androidannotations-api:$AAVersion"
66-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"
6765

6866
implementation project(':common-third-library')
6967
implementation project(':common-coding')
@@ -75,7 +73,6 @@ repositories {
7573
}
7674

7775
dependencies {
78-
79-
// 图片裁剪,系统的坑太多
76+
// 图片裁剪,系统的坑太多,还是使用第三方的
8077
implementation 'com.github.yalantis:ucrop:2.2.2'
8178
}

0 commit comments

Comments
 (0)