diff --git a/.travis.yml b/.travis.yml index 95e07e066..a45db1b92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: android android: components: - tools - - build-tools-25.0.3 + - build-tools-26.0.2 - android-25 - extra-android-m2repository licenses: diff --git a/build.gradle b/build.gradle index 2eac0cbf7..5d78e4de4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,12 @@ apply from: 'checkstyle.gradle' buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0' classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:1.2.0' } diff --git a/dependencies.gradle b/dependencies.gradle index 243f687af..0d5ae74da 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,5 @@ ext { supportVersion = '25.3.1' - buildToolsVersionVariable = "25.0.3" rxJavaVersion = '1.3.1' sourceCompatibilityVersion = JavaVersion.VERSION_1_7 targetCompatibilityVersion = JavaVersion.VERSION_1_7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1bf6ee0d8..590f0e81d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Apr 14 14:13:27 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/gradlew b/gradlew index 4453ccea3..cccdd3d51 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/mockrxandroidble/build.gradle b/mockrxandroidble/build.gradle index 668b184df..26bd034bd 100644 --- a/mockrxandroidble/build.gradle +++ b/mockrxandroidble/build.gradle @@ -4,7 +4,6 @@ apply from: rootProject.file('gradle/gradle-mvn-push.gradle') android { compileSdkVersion 25 - buildToolsVersion rootProject.ext.buildToolsVersionVariable defaultConfig { minSdkVersion 18 diff --git a/rxandroidble/build.gradle b/rxandroidble/build.gradle index a12997e1f..33f75a263 100644 --- a/rxandroidble/build.gradle +++ b/rxandroidble/build.gradle @@ -4,7 +4,6 @@ apply from: rootProject.file('gradle/gradle-mvn-push.gradle') android { compileSdkVersion 25 - buildToolsVersion rootProject.ext.buildToolsVersionVariable defaultConfig { minSdkVersion 18 @@ -43,6 +42,20 @@ android { preBuild.dependsOn 'checkstyle' } +// Workaround until groovy-android-gradle-plugin 1.3.0 is released +tasks.whenTaskAdded { task -> + if (task.name.contains('UnitTestGroovyWithGroovyc')) { + task.doFirst { + ['debug','release'].each { + def dir = file("build/generated/source/apt/test/$it") + if(!dir.isDirectory()){ + dir.mkdirs() + } + } + } + } +} + dependencies { compile rootProject.ext.libs.rxjava compile rootProject.ext.libs.rxrelay diff --git a/sample/build.gradle b/sample/build.gradle index 9e95fe165..f6dbb2145 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -17,7 +17,6 @@ repositories { android { compileSdkVersion 25 - buildToolsVersion rootProject.ext.buildToolsVersionVariable defaultConfig { applicationId "com.polidea.rxandroidble.sample"