From 36ec4af4f3cae73c48c292ded3bb0b90538bb61e Mon Sep 17 00:00:00 2001 From: Axel Nennker Date: Thu, 2 May 2019 16:35:32 +0200 Subject: [PATCH 1/4] update to gradle to version gradle-5.1.1 and buildToolsVersion to 28.0.3 Signed-off-by: Axel Nennker --- build.gradle | 8 ++++---- config/javadoc.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a454d9ce..d5905a6d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.4.0' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0' classpath 'org.ajoberstar:gradle-git:1.7.2' @@ -40,9 +40,9 @@ try { } project.ext.minSdkVersion = 16 -project.ext.compileSdkVersion = 27 -project.ext.buildToolsVersion = '27.0.3' -project.ext.supportLibVersion = '27.1.1' +project.ext.compileSdkVersion = 28 +project.ext.buildToolsVersion = '28.0.3' +project.ext.supportLibVersion = '28.0.0' task showVersion { doLast { diff --git a/config/javadoc.gradle b/config/javadoc.gradle index f55c4ca3..e9ef29b9 100644 --- a/config/javadoc.gradle +++ b/config/javadoc.gradle @@ -28,6 +28,6 @@ task javadocJar(type: Jar, dependsOn:androidJavadoc) { afterEvaluate { // fixes issue where javadoc can't find android symbols ref: http://stackoverflow.com/a/34572606 androidJavadoc.classpath += files(android.libraryVariants.collect { variant -> - variant.javaCompile.classpath.files + variant.javaCompileProvider.get().classpath.files }) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b65735cd..4a68b960 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 06 13:27:13 PDT 2018 +#Thu May 02 16:24:22 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip From f8602fe73214f3e8b531577b20272ed33509f030 Mon Sep 17 00:00:00 2001 From: Axel Nennker Date: Fri, 3 May 2019 09:03:32 +0200 Subject: [PATCH 2/4] buildToolsVersion unneeded since gradle plugin 3.1 Signed-off-by: Axel Nennker --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index d5905a6d..4f2c549b 100644 --- a/build.gradle +++ b/build.gradle @@ -41,7 +41,6 @@ try { project.ext.minSdkVersion = 16 project.ext.compileSdkVersion = 28 -project.ext.buildToolsVersion = '28.0.3' project.ext.supportLibVersion = '28.0.0' task showVersion { From e733741c23eebb58f4e6e792fc652b066108e95e Mon Sep 17 00:00:00 2001 From: Axel Nennker Date: Fri, 3 May 2019 09:05:55 +0200 Subject: [PATCH 3/4] buildToolsVersion unneeded since gradle plugin 3.1 Signed-off-by: Axel Nennker --- config/android-common.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/config/android-common.gradle b/config/android-common.gradle index 95f96f52..4b385bda 100644 --- a/config/android-common.gradle +++ b/config/android-common.gradle @@ -1,6 +1,5 @@ android { compileSdkVersion rootProject.compileSdkVersion - buildToolsVersion rootProject.buildToolsVersion defaultConfig { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.compileSdkVersion From 7c20f9974855795ddea370121ec6ebaa2bb81077 Mon Sep 17 00:00:00 2001 From: Axel Nennker Date: Fri, 3 May 2019 10:50:09 +0200 Subject: [PATCH 4/4] bump version to 28 Signed-off-by: Axel Nennker --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aaa37d12..4c8f98a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,8 @@ language: android android: components: - - build-tools-27.0.3 - - android-27 + - build-tools-28.0.3 + - android-28 script: - ./gradlew check jacoco assemble - bash <(curl -s https://codecov.io/bash)