diff --git a/app/build.gradle b/app/build.gradle index 1869dd3..b4bceb1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.application' -apply plugin: "com.jakewharton.butterknife" +apply plugin: 'com.jakewharton.butterknife' android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -22,26 +22,27 @@ android { } ext { - butterknifeVersion = '8.7.0' + butterknifeVersion = '8.8.1' } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - testCompile "junit:junit:$rootProject.junitVersion" + testImplementation "junit:junit:$rootProject.junitVersion" - compile project(':domain') - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.android.support:support-v4:25.3.1' + api project(':domain') + + implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion" //images-glide - compile "com.github.bumptech.glide:glide:$rootProject.glideVersion" + implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion" //高斯模糊 - compile 'jp.wasabeef:glide-transformations:2.0.1' + implementation 'jp.wasabeef:glide-transformations:2.0.1' //butterknife - compile "com.jakewharton:butterknife:$butterknifeVersion" + implementation "com.jakewharton:butterknife:$butterknifeVersion" annotationProcessor "com.jakewharton:butterknife-compiler:$butterknifeVersion" } diff --git a/base/build.gradle b/base/build.gradle index 0d456b9..f7979d7 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -23,16 +23,16 @@ android { dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" - compile "com.android.support:design:$rootProject.supportLibraryVersion" - compile "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion" - compile "com.android.support:support-v4:$rootProject.supportLibraryVersion" + api "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion" + api "com.android.support:design:$rootProject.supportLibraryVersion" + api "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion" + api "com.android.support:support-v4:$rootProject.supportLibraryVersion" - testCompile "junit:junit:$rootProject.junitVersion" + testImplementation "junit:junit:$rootProject.junitVersion" } diff --git a/build.gradle b/build.gradle index 02d37fa..098dcd0 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,16 @@ buildscript { repositories { + mavenCentral() jcenter() + google() + // TODO remove after butterknife 9 graduates to stable + maven { name 'Sonatype SNAPSHOTs'; url 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' - classpath 'org.greenrobot:greendao-gradle-plugin:3.2.1' - classpath 'com.jakewharton:butterknife-gradle-plugin:8.5.1' + classpath 'com.android.tools.build:gradle:3.1.1' + classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' + classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-SNAPSHOT' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -17,6 +21,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } @@ -28,13 +33,13 @@ task clean(type: Delete) { ext { // Sdk and tools minSdkVersion = 16 - targetSdkVersion = 25 - compileSdkVersion = 25 - buildToolsVersion = '25.0.3' + targetSdkVersion = 27 + compileSdkVersion = 27 + buildToolsVersion = '27.0.3' // App dependencies junitVersion = '4.12' - supportLibraryVersion = '25.3.1' + supportLibraryVersion = '27.1.1' glideVersion = '3.7.0' daggerVersion = '2.10' diff --git a/data/build.gradle b/data/build.gradle index a1bec13..24a62aa 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -39,29 +39,29 @@ ext { okhttpVersion = '3.6.0' retrofitVersion = '2.2.0' simpleXmlVersion = '2.7.+' - greendaoVersion = '3.2.0' + greendaoVersion = '3.2.2' } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - testCompile "junit:junit:$rootProject.junitVersion" + testImplementation "junit:junit:$rootProject.junitVersion" //DataBase - compile "org.greenrobot:greendao:$greendaoVersion" + implementation "org.greenrobot:greendao:$greendaoVersion" //fastjson - compile "com.alibaba:fastjson:$fastjsonVersion" + implementation "com.alibaba:fastjson:$fastjsonVersion" //network - compile "com.squareup.okhttp3:okhttp:$okhttpVersion" - compile "com.squareup.okhttp3:logging-interceptor:$okhttpVersion" - compile "com.squareup.retrofit2:retrofit:$retrofitVersion" - compile "com.squareup.retrofit2:converter-gson:$retrofitVersion" - compile "com.squareup.retrofit2:converter-simplexml:$retrofitVersion" - compile "org.simpleframework:simple-xml:$simpleXmlVersion" + implementation "com.squareup.okhttp3:okhttp:$okhttpVersion" + implementation "com.squareup.okhttp3:logging-interceptor:$okhttpVersion" + api "com.squareup.retrofit2:retrofit:$retrofitVersion" + api "com.squareup.retrofit2:converter-gson:$retrofitVersion" + api "com.squareup.retrofit2:converter-simplexml:$retrofitVersion" + implementation "org.simpleframework:simple-xml:$simpleXmlVersion" - compile project(':base') + api project(':base') } diff --git a/domain/build.gradle b/domain/build.gradle index 861872a..4d2413e 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -22,11 +22,11 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - testCompile "junit:junit:$rootProject.junitVersion" + testImplementation "junit:junit:$rootProject.junitVersion" - compile project(':data') + api project(':data') } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 630f64d..40f41e3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 04 10:15:41 CST 2017 +#Wed Apr 18 12:14:11 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip