Skip to content

Commit 01debdd

Browse files
committed
update build.gradle.
1 parent 242ab8c commit 01debdd

File tree

8 files changed

+12
-21
lines changed

8 files changed

+12
-21
lines changed

RxArcGisKit/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-kapt' //kapt3插件
34
apply plugin: 'kotlin-android-extensions'
45

56

@@ -40,5 +41,4 @@ dependencies {
4041
compileOnly 'com.esri.arcgisruntime:arcgis-android:100.3.0'
4142
compileOnly project(':RxKit')
4243
// implementation "androidx.core:core-ktx:1.2.0"
43-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4444
}

RxCamera/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-kapt' //kapt3插件
34
apply plugin: 'kotlin-android-extensions'
45

56
android {
@@ -47,6 +48,5 @@ dependencies {
4748
compileOnly 'io.reactivex.rxjava2:rxjava:2.2.14'
4849
compileOnly 'io.reactivex.rxjava2:rxandroid:2.1.1'
4950
// implementation "androidx.core:core-ktx:1.2.0"
50-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5151
}
5252

RxDemo/build.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-kapt' //kapt3插件
4-
//apply plugin: 'com.jakewharton.butterknife'
54
apply plugin: 'kotlin-android-extensions'
65

76
android {
@@ -55,13 +54,6 @@ dependencies {
5554
implementation project(':RxFeature')
5655
implementation project(':RxArcGisKit')
5756

58-
59-
//cardView包
60-
//appcompat包
61-
//recyclerview包
62-
//流式布局
63-
//动画向下版本兼容 nineold包
64-
//noinspection GradleCompatible
6557
implementation 'com.google.android.material:material:1.1.0'
6658
implementation 'androidx.cardview:cardview:1.0.0'
6759
implementation 'androidx.appcompat:appcompat:1.1.0'
@@ -74,7 +66,7 @@ dependencies {
7466
implementation 'com.nineoldandroids:library:2.4.0'
7567

7668
implementation 'com.github.bumptech.glide:glide:4.7.1'
77-
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
69+
kapt 'com.github.bumptech.glide:compiler:4.7.1'
7870
implementation 'jp.wasabeef:glide-transformations:3.3.0'
7971
// If you want to use the GPU Filters
8072
implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
@@ -101,5 +93,4 @@ dependencies {
10193
configurations.all {
10294
exclude group: 'com.android.support', module: 'support-v13'
10395
}
104-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
10596
}

RxFeature/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-kapt' //kapt3插件
34
apply plugin: 'kotlin-android-extensions'
45

56
android {
@@ -43,7 +44,6 @@ dependencies {
4344
implementation 'com.google.zxing:core:3.3.0'
4445
compileOnly project(':RxKit')
4546
compileOnly project(':RxUI')
46-
// implementation "androidx.core:core-ktx:1.2.0"
47-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
47+
4848

4949
}

RxKit/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-kapt' //kapt3插件
34
apply plugin: 'kotlin-android-extensions'
45
apply plugin: 'org.greenrobot.greendao'
56

@@ -66,7 +67,6 @@ dependencies {
6667

6768
compileOnly 'org.greenrobot:greendao:3.2.2'
6869
// implementation "androidx.core:core-ktx:1.2.0"
69-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
7070

7171
}
7272

RxPay/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-kapt' //kapt3插件
34
apply plugin: 'kotlin-android-extensions'
45

56
android {
@@ -47,7 +48,6 @@ dependencies {
4748
compileOnly project(':RxKit')
4849
compileOnly project(':RxUI')
4950
// implementation "androidx.core:core-ktx:1.2.0"
50-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5151

5252
}
5353

RxUI/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-kapt' //kapt3插件
34
apply plugin: 'kotlin-android-extensions'
45

56
android {
@@ -40,8 +41,7 @@ dependencies {
4041
compileOnly project(':RxKit')
4142

4243
compileOnly 'com.github.bumptech.glide:glide:4.7.1'
43-
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
44+
kapt 'com.github.bumptech.glide:compiler:4.7.1'
4445
// implementation "androidx.core:core-ktx:1.2.0"
45-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4646
}
4747

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12-
org.gradle.jvmargs=-Xmx1536m
1312

1413
# When configured, Gradle will run in incubating parallel mode.
1514
# This option should only be used with decoupled projects. More details, visit
1615
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1716
# org.gradle.parallel=true
1817

19-
android.useAndroidX=true
20-
android.enableJetifier=true
18+
android.enableJetifier=true
19+
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
20+
android.useAndroidX=true

0 commit comments

Comments
 (0)