Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Update example projects #2263

Merged
WonderCsabo merged 2 commits into from
Mar 30, 2020
Merged

Update example projects #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ed75c
Update example projects
WonderCsabo Mar 30, 2020
e3ac7f8
Add quiet flag to Travis build
WonderCsabo Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions examples/RoboGuiceExample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions examples/gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion examples/gradle/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions examples/kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/kotlin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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