Merge pull request androidannotations#2263 from WonderCsabo/update-example-projects

WonderCsabo · web-flow · commit 0cef59e00296 · 2020-03-30T14:54:36.000+02:00
Update example projects
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlin_version = "1.3.21"
+    ext.kotlin_version = "1.3.71"
 
     repositories {
         google()
         jcenter()
     }
     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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`	`7`	`// replace with the current version of the Android plugin`
`8`		`- classpath "com.android.tools.build:gradle:3.3.1"`
	`8`	`+ classpath "com.android.tools.build:gradle:3.6.1"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`@@ -27,11 +27,11 @@ dependencies {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`android {`
`30`		`- compileSdkVersion 28`
	`30`	`+ compileSdkVersion 29`
`31`	`31`
`32`	`32`	`defaultConfig {`
`33`	`33`	`minSdkVersion 14`
`34`		`- targetSdkVersion 28`
	`34`	`+ targetSdkVersion 29`
`35`	`35`
`36`	`36`	`// If you have different applicationIds for buildTypes or productFlavors uncomment this block.`
`37`	`37`	`//javaCompileOptions {`