fix Issue #4: conflict of kotlin and databinding

fashare2015 · Sep 28, 2017 · 9c3ae62 · 9c3ae62
1 parent 284b73a
commit 9c3ae62
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,8 +34,11 @@ subprojects {
     apply plugin: 'kotlin-android'
     apply plugin: 'kotlin-android-extensions'   // 拓展
 
-    if(enableDataBinding)
-        apply plugin: 'kotlin-kapt'
+    // kapt
+    apply plugin: 'kotlin-kapt'
+    kapt {
+        generateStubs = true
+    }
 
     android {
         compileSdkVersion rootProject.ext.compileSdkVersion as Integer
@@ -72,17 +75,11 @@ subprojects {
     dependencies {
         // kotlin
         compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+        kapt "com.android.databinding:compiler:$rootProject.ext.android_plugin_version"
 
         /******* rx ****************************************************************************/
         compile "io.reactivex.rxjava2:rxjava:$rootProject.ext.rxjavaVersion"    //1.3MB [EventBus]
         compile "io.reactivex.rxjava2:rxandroid:$rootProject.ext.rxandroidVersion" //8KB
-
-        if(enableDataBinding){
-            kapt "com.android.databinding:compiler:$rootProject.ext.android_plugin_version"
-
-//            compile 'me.tatarka.bindingcollectionadapter:bindingcollectionadapter:1.1.0'
-//            compile 'me.tatarka.bindingcollectionadapter:bindingcollectionadapter-recyclerview:1.1.0'
-        }
     }
 }