Bug 1263390 - Use Gradle 2.10 and Android Gradle plugin 2.0. r?mcomella draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Tue, 19 Apr 2016 20:01:38 +0200
changeset 354198 33fe30a5108b5a3c94d92b36491eb0918464bf63
parent 354197 c0e8ba1d2f5374d584a2638ac60eff9e1ad530d4
child 354199 73ca60c33ad616471d81948bc0a1a7e76d770593
push id15990
push users.kaspari@gmail.com
push dateWed, 20 Apr 2016 09:05:12 +0000
reviewersmcomella
bugs1263390
milestone48.0a1
Bug 1263390 - Use Gradle 2.10 and Android Gradle plugin 2.0. r?mcomella MozReview-Commit-ID: SR6rhVroKv
build.gradle
gradle/wrapper/gradle-wrapper.properties
testing/docker/android-gradle-build/bin/after.sh
--- a/build.gradle
+++ b/build.gradle
@@ -28,17 +28,17 @@ buildscript {
         }
         // For android-sdk-manager SNAPSHOT releases.
         maven {
             url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
         }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
         classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.4') {
             // Without these, we get errors linting.
             exclude module: 'guava'
         }
         // Provided in tree.
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:1.5.0-SNAPSHOT'
     }
 }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-#Mon Nov 02 13:44:39 GMT 2015
+#Tue Apr 12 09:52:06 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
-distributionSha256Sum=2ba0aaa11a3e96ec0af31d532d808e1f09cc6dcad0954e637902a1ab544b9e60
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionSha256Sum=496d60c331f8666f99b66d08ff67a880697a7e85a9d9b76ff08814cf97f61a4c
--- a/testing/docker/android-gradle-build/bin/after.sh
+++ b/testing/docker/android-gradle-build/bin/after.sh
@@ -1,14 +1,14 @@
 #!/bin/bash -vex
 
 set -x -e
 
 : WORKSPACE ${WORKSPACE:=/workspace}
-: GRADLE_VERSION ${GRADLE_VERSION:=2.7}
+: GRADLE_VERSION ${GRADLE_VERSION:=2.10}
 
 set -v
 
 # Package everything up.
 pushd ${WORKSPACE}
 # Not yet.  See notes on tooltool below.
 # cp -R /root/.android-sdk android-sdk-linux
 # tar cJf android-sdk-linux.tar.xz android-sdk-linux