update gradles to make the build pass on Android Studio 3.0

This commit is contained in:
Li Xingming
2017-11-21 11:58:06 +08:00
parent ae30300e1c
commit 2822604ae0
5 changed files with 22 additions and 12 deletions

View File

@@ -5,10 +5,11 @@ buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.2'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
classpath 'com.android.tools.build:gradle:3.0.0'
// classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
}
}

View File

@@ -6,22 +6,22 @@ allprojects {
ext {
//Android
androidBuildToolsVersion = "24.0.1"
androidBuildToolsVersion = "27.0.1"
androidMinSdkVersion = 15
androidTargetSdkVersion = 21
androidCompileSdkVersion = 21
androidTargetSdkVersion = 26
androidCompileSdkVersion = 26
//Libraries
daggerVersion = '2.8'
butterKnifeVersion = '7.0.1'
recyclerViewVersion = '21.0.3'
recyclerViewVersion = '25.4.0'
rxJavaVersion = '2.0.2'
rxAndroidVersion = '2.0.1'
javaxAnnotationVersion = '1.0'
javaxInjectVersion = '1'
gsonVersion = '2.3'
okHttpVersion = '2.5.0'
androidAnnotationsVersion = '21.0.3'
androidAnnotationsVersion = '25.4.0'
arrowVersion = '1.0.0'
//Testing
@@ -30,7 +30,7 @@ ext {
assertJVersion = '1.7.1'
mockitoVersion = '1.9.5'
dexmakerVersion = '1.0'
espressoVersion = '2.0'
espressoVersion = '3.0.1'
testingSupportLibVersion = '0.1'
//Development

View File

@@ -8,7 +8,7 @@ buildscript {
}
apply plugin: 'com.android.library'
apply plugin: 'com.neenbedankt.android-apt'
//apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'me.tatarka.retrolambda'
android {
@@ -65,3 +65,7 @@ dependencies {
testCompile testDependencies.mockito
testCompile testDependencies.robolectric
}
repositories {
google()
}

View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

View File

@@ -1,5 +1,5 @@
apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
//apply plugin: 'com.neenbedankt.android-apt'
android {
def globalConfiguration = rootProject.extensions.getByName("ext")
@@ -65,9 +65,10 @@ dependencies {
compile project(':domain')
compile project(':data')
apt presentationDependencies.daggerCompiler
annotationProcessor presentationDependencies.daggerCompiler
compile presentationDependencies.dagger
compile presentationDependencies.butterKnife
annotationProcessor presentationDependencies.butterKnife
compile presentationDependencies.recyclerView
compile presentationDependencies.rxJava
compile presentationDependencies.rxAndroid
@@ -82,3 +83,7 @@ dependencies {
//Development
compile developmentDependencies.leakCanary
}
repositories {
google()
}