diff --git a/.travis.yml b/.travis.yml index f27f3951d3..8a0ca6184c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ android: - tools # https://github.com/travis-ci/travis-ci/issues/6059 - platform-tools - android-16 - - android-28 + - android-29 - build-tools-28.0.3 before_script: @@ -32,7 +32,7 @@ before_script: script: - set -e - cd $TRAVIS_BUILD_DIR/AndroidAnnotations - - ./mvnw install -P travis + - ./mvnw install -P travis -q - cd $TRAVIS_BUILD_DIR/examples/maven - ./mvnw install - cd $TRAVIS_BUILD_DIR/examples/gradle diff --git a/examples/RoboGuiceExample/build.gradle b/examples/RoboGuiceExample/build.gradle index df9fd6579e..fbabfe97b5 100644 --- a/examples/RoboGuiceExample/build.gradle +++ b/examples/RoboGuiceExample/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { // replace with the current version of the Android plugin - classpath "com.android.tools.build:gradle:3.3.1" + classpath "com.android.tools.build:gradle:3.6.1" } } @@ -27,11 +27,11 @@ dependencies { } android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 29 // If you have different applicationIds for buildTypes or productFlavors uncomment this block. //javaCompileOptions { diff --git a/examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties b/examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties index 7919ae6e6b..4c83d2a144 100644 --- a/examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties +++ b/examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip diff --git a/examples/gradle/build.gradle b/examples/gradle/build.gradle index f95cab37d9..24c1e97f44 100644 --- a/examples/gradle/build.gradle +++ b/examples/gradle/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { // replace with the current version of the Android plugin - classpath "com.android.tools.build:gradle:3.3.1" + classpath "com.android.tools.build:gradle:3.6.1" } } @@ -24,11 +24,11 @@ dependencies { } android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 29 // If you have different applicationIds for buildTypes or productFlavors uncomment this block. //javaCompileOptions { diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/gradle/wrapper/gradle-wrapper.properties index cfb1a4bcb7..4322154aae 100644 --- a/examples/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/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-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip diff --git a/examples/kotlin/build.gradle b/examples/kotlin/build.gradle index 03945d3e3e..e6bf7d90a7 100644 --- a/examples/kotlin/build.gradle +++ b/examples/kotlin/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = "1.3.21" + ext.kotlin_version = "1.3.71" repositories { google() @@ -7,7 +7,7 @@ buildscript { } dependencies { // replace with the current version of the Android plugin - classpath "com.android.tools.build:gradle:3.3.1" + classpath "com.android.tools.build:gradle:3.6.1" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version" } @@ -25,11 +25,11 @@ apply plugin: "kotlin-allopen" apply plugin: "kotlin-kapt" android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 29 } sourceSets { main.java.srcDirs += "src/main/kotlin" diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties index 1b2b07cfb0..6623300beb 100644 --- a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists