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

Update versions in example projects #1971

Merged
WonderCsabo merged 8 commits into from
Mar 13, 2017
Merged

Update versions in example projects #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f600b8
Update gradle wrappers
dodgex Mar 11, 2017
722fafd
Update kotlin version from 1.0.6 to 1.1.0
dodgex Mar 11, 2017
449f6c9
Update buildToolsVersion to 25.0.2
dodgex Mar 11, 2017
0cf523c
Update compile- and targetSdkVersion to 25
dodgex Mar 11, 2017
4c1a78f
Update android build plugin to 2.3.0
dodgex Mar 11, 2017
7b402d1
Update APT configuration for Android Plugin 2.3.0
dodgex Mar 11, 2017
e704ea8
Use only double-quotes to be consistent
dodgex Mar 11, 2017
811f0ae
Remove JDK 7 from travis builds
dodgex Mar 12, 2017
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
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ language: android

jdk:
- oraclejdk8
- oraclejdk7

android:
components:
- tools
- tools # https://github.com/travis-ci/travis-ci/issues/6059
- platform-tools
- android-23
- build-tools-23.0.3
- android-25
- build-tools-25.0.2

before_script:
- export TERM=dumb
Expand Down
32 changes: 16 additions & 16 deletions examples/RoboGuiceExample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ buildscript {
}
dependencies {
// replace with the current version of the Android plugin
classpath 'com.android.tools.build:gradle:2.1.0'
// the latest version of the android-apt plugin
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath "com.android.tools.build:gradle:2.3.0"
}
}

Expand All @@ -15,33 +13,35 @@ repositories {
mavenLocal()
}

apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
def AAVersion = '4.3.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 4.2.0
apply plugin: "com.android.application"

def AAVersion = "4.3.0-SNAPSHOT" // change this to your desired version, for example the latest stable: 4.2.0
dependencies {
apt "org.androidannotations:androidannotations:$AAVersion"
annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
compile "org.androidannotations:androidannotations-api:$AAVersion"
apt "org.androidannotations:roboguice:$AAVersion"
annotationProcessor "org.androidannotations:roboguice:$AAVersion"
compile "org.androidannotations:roboguice-api:$AAVersion"
compile 'org.roboguice:roboguice:3.0.1'
// apt 'org.roboguice:roboblender:3.0.1'
// RoboBlender does not work with android-apt currently, so unfortunately we have to turn it off
compile "org.roboguice:roboguice:3.0.1"
}


android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 25
buildToolsVersion "25.0.2"

defaultConfig {
minSdkVersion 9
targetSdkVersion 23
targetSdkVersion 25

// If you have different applicationIds for buildTypes or productFlavors uncomment this block.
//javaCompileOptions {
// annotationProcessorOptions {
// arguments = ['resourcePackageName': android.defaultConfig.applicationId]
// }
//}
}

lintOptions {
abortOnError false
// see https://github.com/roboguice/roboguice/issues/295
}

}
Binary file modified examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Dec 09 11:11:25 CET 2014
#Sat Mar 11 20:58:22 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
74 changes: 41 additions & 33 deletions examples/RoboGuiceExample/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 4 additions & 10 deletions examples/RoboGuiceExample/gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions examples/gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ buildscript {
}
dependencies {
// replace with the current version of the Android plugin
classpath 'com.android.tools.build:gradle:2.1.0'
// the latest version of the android-apt plugin
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
classpath "com.android.tools.build:gradle:2.3.0"
}
}

Expand All @@ -15,21 +13,27 @@ repositories {
mavenLocal()
}

apply plugin: 'com.android.application'
apply plugin: 'com.neenbedankt.android-apt'
def AAVersion = '4.3.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 4.2.0
apply plugin: "com.android.application"

def AAVersion = "4.3.0-SNAPSHOT" // change this to your desired version, for example the latest stable: 4.2.0
dependencies {
apt "org.androidannotations:androidannotations:$AAVersion"
annotationProcessor "org.androidannotations:androidannotations:$AAVersion"
compile "org.androidannotations:androidannotations-api:$AAVersion"
}

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
compileSdkVersion 25
buildToolsVersion "25.0.2"

defaultConfig {
minSdkVersion 9
targetSdkVersion 23
targetSdkVersion 25

// If you have different applicationIds for buildTypes or productFlavors uncomment this block.
//javaCompileOptions {
// annotationProcessorOptions {
// arguments = ['resourcePackageName': android.defaultConfig.applicationId]
// }
//}
}
}
Binary file modified examples/gradle/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/gradle/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Dec 09 11:11:25 CET 2014
#Sat Mar 11 20:58:22 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
Loading