Skip to content

Commit 728fdfc

Browse files
dodgexdodgex
authored
Merge pull request androidannotations#2208 from WonderCsabo/update-example-projects
Update example projects
2 parents 1e56204 + e7c98aa commit 728fdfc

20 files changed

Lines changed: 112 additions & 39 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android:
1919
- tools # https://github.com/travis-ci/travis-ci/issues/6059
2020
- platform-tools
2121
- android-16
22-
- android-26
23-
- build-tools-26.0.2
22+
- android-28
23+
- build-tools-28.0.3
2424

2525
before_script:
2626
- export TERM=dumb

‎examples/RoboGuiceExample/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ buildscript {
55
}
66
dependencies {
77
// replace with the current version of the Android plugin
8-
classpath "com.android.tools.build:gradle:3.0.0"
8+
classpath "com.android.tools.build:gradle:3.3.1"
99
}
1010
}
1111

1212
repositories {
13+
google()
1314
mavenCentral()
1415
mavenLocal()
1516
}
@@ -26,12 +27,11 @@ dependencies {
2627
}
2728

2829
android {
29-
compileSdkVersion 26
30-
buildToolsVersion "26.0.2"
30+
compileSdkVersion 28
3131

3232
defaultConfig {
3333
minSdkVersion 14
34-
targetSdkVersion 26
34+
targetSdkVersion 28
3535

3636
// If you have different applicationIds for buildTypes or productFlavors uncomment this block.
3737
//javaCompileOptions {

‎examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.jar‎

515 Bytes
Binary file not shown.

‎examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Mar 11 20:58:22 CET 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

‎examples/RoboGuiceExample/gradlew‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/gradle/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ buildscript {
55
}
66
dependencies {
77
// replace with the current version of the Android plugin
8-
classpath "com.android.tools.build:gradle:3.0.0"
8+
classpath "com.android.tools.build:gradle:3.3.1"
99
}
1010
}
1111

1212
repositories {
13+
google()
1314
mavenLocal()
1415
mavenCentral()
1516
}
@@ -23,12 +24,11 @@ dependencies {
2324
}
2425

2526
android {
26-
compileSdkVersion 26
27-
buildToolsVersion "26.0.2"
27+
compileSdkVersion 28
2828

2929
defaultConfig {
3030
minSdkVersion 14
31-
targetSdkVersion 26
31+
targetSdkVersion 28
3232

3333
// If you have different applicationIds for buildTypes or productFlavors uncomment this block.
3434
//javaCompileOptions {

‎examples/gradle/gradle/wrapper/gradle-wrapper.jar‎

515 Bytes
Binary file not shown.

‎examples/gradle/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Mar 11 20:58:22 CET 2017
1+
#Sat Feb 16 14:03:44 CET 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip

‎examples/gradle/gradlew‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/kotlin/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
buildscript {
2-
ext.kotlin_version = "1.1.51"
2+
ext.kotlin_version = "1.3.21"
33

44
repositories {
55
google()
66
jcenter()
77
}
88
dependencies {
99
// replace with the current version of the Android plugin
10-
classpath "com.android.tools.build:gradle:3.0.0"
10+
classpath "com.android.tools.build:gradle:3.3.1"
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
1313
}
1414
}
1515

1616
repositories {
17+
google()
1718
mavenLocal()
1819
mavenCentral()
1920
}
@@ -24,12 +25,11 @@ apply plugin: "kotlin-allopen"
2425
apply plugin: "kotlin-kapt"
2526

2627
android {
27-
compileSdkVersion 26
28-
buildToolsVersion "26.0.2"
28+
compileSdkVersion 28
2929

3030
defaultConfig {
3131
minSdkVersion 14
32-
targetSdkVersion 26
32+
targetSdkVersion 28
3333
}
3434
sourceSets {
3535
main.java.srcDirs += "src/main/kotlin"
@@ -54,5 +54,5 @@ def AAVersion = "4.7.0-SNAPSHOT" // change this to your desired version, for exa
5454
dependencies {
5555
kapt "org.androidannotations:androidannotations:$AAVersion"
5656
implementation "org.androidannotations:androidannotations-api:$AAVersion"
57-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
57+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5858
}

0 commit comments

Comments
 (0)