diff --git a/app/build.gradle b/app/build.gradle index 6a9765c9268fa523598f0053430d56399f6babd3..2dad3111330ffb07f880de0d8fc84170de60db9d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'com.android.application' -apply plugin: 'com.neenbedankt.android-apt' android { compileSdkVersion rootProject.ext.android["compileSdkVersion"] @@ -44,21 +43,22 @@ buildscript { repositories { jcenter() } - dependencies { - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - } } dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile rootProject.ext.dependencies["junit"] - apt rootProject.ext.dependencies["dagger2-apt-compiler"] + //tools provided rootProject.ext.dependencies["javax.annotation"] - apt rootProject.ext.dependencies["butterknife-apt"] + annotationProcessor rootProject.ext.dependencies["dagger2-compiler"] + //view + annotationProcessor rootProject.ext.dependencies["butterknife-compiler"] + compile rootProject.ext.dependencies["paginate"] + //arms // compile project(':arms') compile 'me.jessyan:arms:1.2.4' - compile rootProject.ext.dependencies["paginate"] + //test + testCompile rootProject.ext.dependencies["junit"] debugCompile rootProject.ext.dependencies["canary-debug"] releaseCompile rootProject.ext.dependencies["canary-release"] testCompile rootProject.ext.dependencies["canary-release"] diff --git a/arms/build.gradle b/arms/build.gradle index e349263a2ba3a3596fe420b116fd9f3685e79b45..05a47f79c025ca80249829c339e861acf64336f1 100644 --- a/arms/build.gradle +++ b/arms/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.library' -apply plugin: 'com.neenbedankt.android-apt' + android { compileSdkVersion rootProject.ext.android["compileSdkVersion"] buildToolsVersion rootProject.ext.android["buildToolsVersion"] @@ -24,19 +24,16 @@ buildscript { repositories { jcenter() } - dependencies { - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - } } dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile rootProject.ext.dependencies["junit"] + + //support compile (rootProject.ext.dependencies["support-v4"]){ exclude module: 'support-annotations' } - compile rootProject.ext.dependencies["gson"] compile (rootProject.ext.dependencies["appcompat-v7"]){ exclude module: 'support-annotations' exclude module: 'support-v4' @@ -44,20 +41,35 @@ dependencies { compile (rootProject.ext.dependencies["cardview-v7"]){ exclude module: 'support-annotations' } + compile (rootProject.ext.dependencies["design"]){ + exclude module: 'support-annotations' + } + compile rootProject.ext.dependencies["annotations"] + + + + //view compile (rootProject.ext.dependencies["autolayout"]) { exclude group: 'com.android.support' } compile (rootProject.ext.dependencies["butterknife"]){ exclude module: 'support-annotations' } - compile rootProject.ext.dependencies["androideventbus"] - compile (rootProject.ext.dependencies["design"]){ - exclude module: 'support-annotations' - } + + + + //rx compile rootProject.ext.dependencies["rxjava"] compile (rootProject.ext.dependencies["rxandroid"]){ exclude module: 'rxjava' } + compile (rootProject.ext.dependencies["rxcache"]){ + exclude module: 'rxjava' + exclude module: 'dagger' + } + compile (rootProject.ext.dependencies["rxcache-jolyglot-gson"]){ + exclude module: 'gson' + } compile (rootProject.ext.dependencies["rxlifecycle"]){ exclude module: 'rxjava' } @@ -68,14 +80,13 @@ dependencies { exclude module: 'rxjava' exclude module: 'rxandroid' } - compile (rootProject.ext.dependencies["rxcache"]){ + compile rootProject.ext.dependencies["rxpermissions"] + compile (rootProject.ext.dependencies['rxerrorhandler']){ exclude module: 'rxjava' - exclude module: 'dagger' - } - compile (rootProject.ext.dependencies["rxcache-jolyglot-gson"]){ - exclude module: 'gson' } - compile rootProject.ext.dependencies["rxpermissions"] + + + //network compile (rootProject.ext.dependencies["retrofit"]){ exclude module: 'okhttp' } @@ -85,16 +96,19 @@ dependencies { compile (rootProject.ext.dependencies["retrofit-adapter-rxjava"]){ exclude module: 'rxjava' } + compile rootProject.ext.dependencies["okhttp3"] + compile rootProject.ext.dependencies["glide"] + + //tools provided rootProject.ext.dependencies["javax.annotation"] - compile rootProject.ext.dependencies["annotations"] compile rootProject.ext.dependencies["dagger2"] - compile rootProject.ext.dependencies["okhttp3"] + annotationProcessor rootProject.ext.dependencies["dagger2-compiler"] + compile rootProject.ext.dependencies["androideventbus"] + compile rootProject.ext.dependencies["gson"] + + //test compile rootProject.ext.dependencies["timber"] - compile rootProject.ext.dependencies["glide"] - apt rootProject.ext.dependencies["dagger2-apt-compiler"] - compile (rootProject.ext.dependencies["rxerrorhandler"]){ - exclude module: 'rxjava' - } + testCompile rootProject.ext.dependencies["junit"] } diff --git a/config.gradle b/config.gradle index e6e87d17427ef9b59737bca0c21fb51a52064b89..679fdf466051ac2feab426b1735830a4f553b9bb 100644 --- a/config.gradle +++ b/config.gradle @@ -1,68 +1,85 @@ ext { - android = [compileSdkVersion : 25, + android = [ + compileSdkVersion : 25, buildToolsVersion : "25.0.2", minSdkVersion : 15, targetSdkVersion : 25, - versionCode : 24, - versionName : "1.2.4", - androidSupportSdkVersion: "25.1.1", - retrofitSdkVersion : "2.1.0", - dagger2SdkVersion : "2.8", - rxlifecycleSdkVersion : "1.0", - espressoSdkVersion : "2.2.2" + versionCode : 25, + versionName : "1.2.5", ] + + version = [ + androidSupportSdkVersion: "25.3.1", + retrofitSdkVersion : "2.2.0", + dagger2SdkVersion : "2.10", + butterknifeSdkVersion : "8.5.1", + rxlifecycleSdkVersion : "1.0", + espressoSdkVersion : "2.2.2", + canarySdkVersion : "1.5" + ] + dependencies = [ - "multidex" : "compile 'com.android.support:multidex:1.0.1'", - "androidJUnitRunner" : "android.support.test.runner.AndroidJUnitRunner", - "javax.annotation" : 'javax.annotation:jsr250-api:1.0', - "appcompat-v7" : "com.android.support:appcompat-v7:${android["androidSupportSdkVersion"]}", - "design" : "com.android.support:design:${android["androidSupportSdkVersion"]}", - "support-v4" : "com.android.support:support-v4:${android["androidSupportSdkVersion"]}", - "cardview-v7" : "com.android.support:cardview-v7:${android["androidSupportSdkVersion"]}", - "annotations" : "com.android.support:support-annotations:${android["androidSupportSdkVersion"]}", - "recyclerview-v7" : "com.android.support:recyclerview-v7:${android["androidSupportSdkVersion"]}", - "retrofit" : "com.squareup.retrofit2:retrofit:${android["retrofitSdkVersion"]}", - "retrofit-converter-gson" : "com.squareup.retrofit2:converter-gson:${android["retrofitSdkVersion"]}", - "retrofit-adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava:${android["retrofitSdkVersion"]}", - "junit" : "junit:junit:4.12", - "okhttp3" : "com.squareup.okhttp3:okhttp:3.6.0", - "gson" : "com.google.code.gson:gson:2.7", - "autolayout" : "com.zhy:autolayout:1.4.5", - "butterknife" : "com.jakewharton:butterknife:8.5.1", - "butterknife-apt" : "com.jakewharton:butterknife-compiler:8.5.1", - "glide" : "com.github.bumptech.glide:glide:3.7.0", - "androideventbus" : "org.simple:androideventbus:1.0.5.1", - "rxandroid" : "io.reactivex:rxandroid:1.2.1", - "rxjava" : "io.reactivex:rxjava:1.2.6", - "rxlifecycle" : "com.trello:rxlifecycle:${android["rxlifecycleSdkVersion"]}", - "rxlifecycle-components" : "com.trello:rxlifecycle-components:${android["rxlifecycleSdkVersion"]}", - "rxcache" : "com.github.VictorAlbertos.RxCache:runtime:1.7.0-1.x", - "rxcache-jolyglot-gson" : "com.github.VictorAlbertos.Jolyglot:gson:0.0.3", - "dagger2" : "com.google.dagger:dagger:${android["dagger2SdkVersion"]}", - "dagger2-apt-compiler" : "com.google.dagger:dagger-compiler:${android["dagger2SdkVersion"]}", - "rxbinding-recyclerview-v7": "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:0.4.0", - "rxpermissions" : "com.tbruyelle.rxpermissions:rxpermissions:0.9.1@aar", - "pickerview" : "com.bigkoo:pickerview:2.0.8", - "nineoldandroids" : "com.nineoldandroids:library:2.4.0", - "picasso" : "com.squareup.picasso:picasso:2.5.2", - "photoview" : "com.github.chrisbanes.photoview:library:1.2.3", - "numberprogressbar" : "com.daimajia.numberprogressbar:library:1.2@aar", - "umeng-analytics" : "com.umeng.analytics:analytics:6.0.1", - "okhttp-urlconnection" : "com.squareup.okhttp:okhttp-urlconnection:2.0.0", - "otto" : "com.squareup:otto:1.3.8", - "paginate" : "com.github.markomilos:paginate:0.5.1", - "rxerrorhandler" : "me.jessyan:rxerrorhandler:1.0.1", - //test - "runner" : 'com.android.support.test:runner:0.5', - "espresso-core" : "com.android.support.test.espresso:espresso-core:${android["espressoSdkVersion"]}", - "espresso-contrib" : ("com.android.support.test.espresso:espresso-contrib:${android["espressoSdkVersion"]}"), - "espresso-intents" : "com.android.support.test.espresso:espresso-intents:${android["espressoSdkVersion"]}", - "mockito-core" : "org.mockito:mockito-core:1.+", - "timber" : "com.jakewharton.timber:timber:4.5.1", - "canary-debug" : "com.squareup.leakcanary:leakcanary-android:1.4-beta2", - "canary-release" : "com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2" - ] + //support + "appcompat-v7" : "com.android.support:appcompat-v7:${version["androidSupportSdkVersion"]}", + "design" : "com.android.support:design:${version["androidSupportSdkVersion"]}", + "support-v4" : "com.android.support:support-v4:${version["androidSupportSdkVersion"]}", + "cardview-v7" : "com.android.support:cardview-v7:${version["androidSupportSdkVersion"]}", + "annotations" : "com.android.support:support-annotations:${version["androidSupportSdkVersion"]}", + "recyclerview-v7" : "com.android.support:recyclerview-v7:${version["androidSupportSdkVersion"]}", + + //network + "retrofit" : "com.squareup.retrofit2:retrofit:${version["retrofitSdkVersion"]}", + "retrofit-converter-gson" : "com.squareup.retrofit2:converter-gson:${version["retrofitSdkVersion"]}", + "retrofit-adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava:${version["retrofitSdkVersion"]}", + "okhttp3" : "com.squareup.okhttp3:okhttp:3.6.0", + "okhttp-urlconnection" : "com.squareup.okhttp:okhttp-urlconnection:2.0.0", + "glide" : "com.github.bumptech.glide:glide:3.7.0", + "picasso" : "com.squareup.picasso:picasso:2.5.2", + + //view + "autolayout" : "com.zhy:autolayout:1.4.5", + "butterknife" : "com.jakewharton:butterknife:${version["butterknifeSdkVersion"]}", + "butterknife-compiler" : "com.jakewharton:butterknife-compiler:${version["butterknifeSdkVersion"]}", + "pickerview" : "com.bigkoo:pickerview:2.0.8", + "photoview" : "com.github.chrisbanes.photoview:library:1.2.3", + "numberprogressbar" : "com.daimajia.numberprogressbar:library:1.2@aar", + "nineoldandroids" : "com.nineoldandroids:library:2.4.0", + "paginate" : "com.github.markomilos:paginate:0.5.1", + + //rx + "rxandroid" : "io.reactivex:rxandroid:1.2.1", + "rxjava" : "io.reactivex:rxjava:1.2.9", + "rxlifecycle" : "com.trello:rxlifecycle:${version["rxlifecycleSdkVersion"]}", + "rxlifecycle-components" : "com.trello:rxlifecycle-components:${version["rxlifecycleSdkVersion"]}", + "rxcache" : "com.github.VictorAlbertos.RxCache:runtime:1.7.0-1.x", + "rxcache-jolyglot-gson" : "com.github.VictorAlbertos.Jolyglot:gson:0.0.3", + "rxbinding-recyclerview-v7": "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:1.0.1", + "rxpermissions" : "com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar", + "rxerrorhandler" : "me.jessyan:rxerrorhandler:1.0.1", + + //tools + "dagger2" : "com.google.dagger:dagger:${version["dagger2SdkVersion"]}", + "dagger2-compiler" : "com.google.dagger:dagger-compiler:${version["dagger2SdkVersion"]}", + "androideventbus" : "org.simple:androideventbus:1.0.5.1", + "otto" : "com.squareup:otto:1.3.8", + "gson" : "com.google.code.gson:gson:2.8.0", + "multidex" : "compile 'com.android.support:multidex:1.0.1'", + "javax.annotation" : 'javax.annotation:jsr250-api:1.0', + + //test + "junit" : "junit:junit:4.12", + "androidJUnitRunner" : "android.support.test.runner.AndroidJUnitRunner", + "runner" : 'com.android.support.test:runner:0.5', + "espresso-core" : "com.android.support.test.espresso:espresso-core:${version["espressoSdkVersion"]}", + "espresso-contrib" : "com.android.support.test.espresso:espresso-contrib:${version["espressoSdkVersion"]}", + "espresso-intents" : "com.android.support.test.espresso:espresso-intents:${version["espressoSdkVersion"]}", + "mockito-core" : "org.mockito:mockito-core:1.+", + "timber" : "com.jakewharton.timber:timber:4.5.1", + "canary-debug" : "com.squareup.leakcanary:leakcanary-android:${version["canarySdkVersion"]}", + "canary-release" : "com.squareup.leakcanary:leakcanary-android-no-op:${version["canarySdkVersion"]}", + "umeng-analytics" : "com.umeng.analytics:analytics:6.0.1" + ] }