diff options
| author | Joe George <joe@zeroc.com> | 2016-09-29 12:11:47 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-09-29 12:11:47 -0400 |
| commit | c56e43b8adc0ffaaa0fcb69e4aa831ea285ad8fb (patch) | |
| tree | c2414e4a1b226244af5875dbab197942abd53aee | |
| parent | Update Android build system (diff) | |
| download | ice-c56e43b8adc0ffaaa0fcb69e4aa831ea285ad8fb.tar.bz2 ice-c56e43b8adc0ffaaa0fcb69e4aa831ea285ad8fb.tar.xz ice-c56e43b8adc0ffaaa0fcb69e4aa831ea285ad8fb.zip | |
Update Java Gradle and Android tools versions
| -rw-r--r-- | android/build.gradle | 4 | ||||
| -rw-r--r-- | android/gradle/wrapper/gradle-wrapper.properties | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android/build.gradle b/android/build.gradle index 4e46c89f0a4..d79d058d2d9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,7 +12,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:2.2.0' } } @@ -47,5 +47,5 @@ subprojects { // the version of gradle needed to build Ice. // task wrapper(type: Wrapper) { - gradleVersion = "2.6" + gradleVersion = "2.10" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 9ba12ec44d1..e4dbc86580e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Aug 12 11:59:45 NDT 2015 +#Thu Sep 29 12:10:32 EDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip |