From 9f3fbfe7cd8f9043786ccaee1b245caa87e77a73 Mon Sep 17 00:00:00 2001 From: Jasper van Putten Date: Fri, 6 Apr 2018 13:49:32 +0200 Subject: [PATCH 1/3] fix annotation --- WhenRobo/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/WhenRobo/build.gradle b/WhenRobo/build.gradle index 55403df..3358c3c 100644 --- a/WhenRobo/build.gradle +++ b/WhenRobo/build.gradle @@ -8,6 +8,12 @@ android { targetSdkVersion targetSdkVersionProp.toInteger() versionCode 1 versionName "1.0" + + javaCompileOptions { + annotationProcessorOptions { + includeCompileClasspath true + } + } } buildTypes { release { @@ -30,6 +36,7 @@ dependencies { provided "org.roboguice:roboguice:$roboGuiceVersion" provided "org.roboguice:roboblender:$roboGuiceVersion" + } project.tasks.withType(JavaCompile) { task -> From 950eb56ba99dbaabfed7b3a2901db4c34b146bcd Mon Sep 17 00:00:00 2001 From: Jasper van Putten Date: Mon, 9 Apr 2018 11:05:09 +0200 Subject: [PATCH 2/3] fixed annotationProcessor --- WhenRobo/build.gradle | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/WhenRobo/build.gradle b/WhenRobo/build.gradle index 3358c3c..be948da 100644 --- a/WhenRobo/build.gradle +++ b/WhenRobo/build.gradle @@ -8,12 +8,6 @@ android { targetSdkVersion targetSdkVersionProp.toInteger() versionCode 1 versionName "1.0" - - javaCompileOptions { - annotationProcessorOptions { - includeCompileClasspath true - } - } } buildTypes { release { @@ -36,7 +30,7 @@ dependencies { provided "org.roboguice:roboguice:$roboGuiceVersion" provided "org.roboguice:roboblender:$roboGuiceVersion" - + annotationProcessor "org.roboguice:roboblender:$roboGuiceVersion" } project.tasks.withType(JavaCompile) { task -> From 0aeeb1342f0a92176159e392f4858aeddecfc30e Mon Sep 17 00:00:00 2001 From: Jasper van Putten Date: Mon, 9 Apr 2018 12:46:50 +0200 Subject: [PATCH 3/3] upgrade gradle --- .travis.yml | 8 +++++--- build.gradle | 3 +++ gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index dca2673..020910e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,12 @@ jdk: android: components: - - tools # important to always do this first, since the version installed of platform-tools below depends on it - platform-tools - - build-tools-24.0.0 - - android-24 + - tools + - extra-android-m2repository + - extra-google-m2repository + - build-tools-27.0.3 + - android-27 env: global: diff --git a/build.gradle b/build.gradle index 23da677..d0530da 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ allprojects { repositories { jcenter() mavenCentral() + google() } @@ -14,6 +15,8 @@ buildscript { repositories { jcenter() mavenCentral() + google() + } dependencies { diff --git a/gradle.properties b/gradle.properties index 1520c58..d5255c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ httpmimeVersion=4.5.2 coverallsGradlePluginVersion=2.6.3 -compileSdkVersionProp=24 -buildToolsVersionProp=24.0.0 -androidGradleVersion=2.1.2 -targetSdkVersionProp=24 -supportVersion=24.0.0 +compileSdkVersionProp=27 +targetSdkVersionProp=27 +buildToolsVersionProp=27.0.3 +androidGradleVersion=3.1.0 +supportVersion=27.0.2 groovyVersion=2.4.6 junitVersion=4.12 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c3e0b36..2523ba0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-2.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip