diff --git a/RxArcGisKit/build.gradle b/RxArcGisKit/build.gradle index 5b209ec5..47804cfa 100644 --- a/RxArcGisKit/build.gradle +++ b/RxArcGisKit/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' //kapt3插件 apply plugin: 'kotlin-android-extensions' @@ -40,5 +41,4 @@ dependencies { compileOnly 'com.esri.arcgisruntime:arcgis-android:100.3.0' compileOnly project(':RxKit') // implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/RxCamera/build.gradle b/RxCamera/build.gradle index f8498838..ad1bfbf8 100644 --- a/RxCamera/build.gradle +++ b/RxCamera/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' //kapt3插件 apply plugin: 'kotlin-android-extensions' android { @@ -47,6 +48,5 @@ dependencies { compileOnly 'io.reactivex.rxjava2:rxjava:2.2.14' compileOnly 'io.reactivex.rxjava2:rxandroid:2.1.1' // implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/RxDemo/build.gradle b/RxDemo/build.gradle index 4df6cbeb..bae38eac 100644 --- a/RxDemo/build.gradle +++ b/RxDemo/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' //kapt3插件 -//apply plugin: 'com.jakewharton.butterknife' apply plugin: 'kotlin-android-extensions' android { @@ -55,13 +54,6 @@ dependencies { implementation project(':RxFeature') implementation project(':RxArcGisKit') - - //cardView包 - //appcompat包 - //recyclerview包 - //流式布局 - //动画向下版本兼容 nineold包 - //noinspection GradleCompatible implementation 'com.google.android.material:material:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.appcompat:appcompat:1.1.0' @@ -74,7 +66,7 @@ dependencies { implementation 'com.nineoldandroids:library:2.4.0' implementation 'com.github.bumptech.glide:glide:4.7.1' - annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1' + kapt 'com.github.bumptech.glide:compiler:4.7.1' implementation 'jp.wasabeef:glide-transformations:3.3.0' // If you want to use the GPU Filters implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1' @@ -101,5 +93,4 @@ dependencies { configurations.all { exclude group: 'com.android.support', module: 'support-v13' } - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/RxFeature/build.gradle b/RxFeature/build.gradle index 014480f2..71a7b83a 100644 --- a/RxFeature/build.gradle +++ b/RxFeature/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' //kapt3插件 apply plugin: 'kotlin-android-extensions' android { @@ -43,7 +44,6 @@ dependencies { implementation 'com.google.zxing:core:3.3.0' compileOnly project(':RxKit') compileOnly project(':RxUI') -// implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + } diff --git a/RxKit/build.gradle b/RxKit/build.gradle index 00cacfc4..1402feea 100644 --- a/RxKit/build.gradle +++ b/RxKit/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' //kapt3插件 apply plugin: 'kotlin-android-extensions' apply plugin: 'org.greenrobot.greendao' @@ -66,7 +67,6 @@ dependencies { compileOnly 'org.greenrobot:greendao:3.2.2' // implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/RxPay/build.gradle b/RxPay/build.gradle index 894fd971..704a1505 100644 --- a/RxPay/build.gradle +++ b/RxPay/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' //kapt3插件 apply plugin: 'kotlin-android-extensions' android { @@ -47,7 +48,6 @@ dependencies { compileOnly project(':RxKit') compileOnly project(':RxUI') // implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/RxUI/build.gradle b/RxUI/build.gradle index 97d10111..8adcc3ce 100644 --- a/RxUI/build.gradle +++ b/RxUI/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' //kapt3插件 apply plugin: 'kotlin-android-extensions' android { @@ -40,8 +41,7 @@ dependencies { compileOnly project(':RxKit') compileOnly 'com.github.bumptech.glide:glide:4.7.1' - annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1' + kapt 'com.github.bumptech.glide:compiler:4.7.1' // implementation "androidx.core:core-ktx:1.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/gradle.properties b/gradle.properties index 706bcd15..894127ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,12 +9,12 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true +org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" +android.useAndroidX=true \ No newline at end of file