diff --git a/build.gradle b/build.gradle index 07660aa38b1f..d31d07cdcddb 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.1.3' classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.4') { // Without these, we get errors linting. exclude module: 'guava' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca653b435c57..8964ccd44413 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue Apr 12 09:52:06 CEST 2016 +#Fri Sep 16 15:41:50 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip -distributionSha256Sum=496d60c331f8666f99b66d08ff67a880697a7e85a9d9b76ff08814cf97f61a4c +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionSha256Sum=88a910cdf2e03ebbb5fe90f7ecf534fc9ac22e12112dc9a2fee810c598a76091 diff --git a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest index 6b19e4b1a8fc..c261ba2bb28b 100644 --- a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest @@ -43,8 +43,8 @@ "visibility": "public", "filename": "gradle-dist.tar.xz", "unpack": true, -"digest": "990edc0e4039dbe5f77790ef59dc0d58faebbb8c82ee497615c7991eec99fe4668d0ab05508c48664b635ff6c0cfd4272db464ae1efaa548e471ab451fe0944f", -"size": 51955340 +"digest": "36f961f85b0be846cc9e72bfa0dd1f74e7da8ef785717ce4fd102fec977f21f8902c233b28a21c1ce3797eb2759c7a74c5f74e47bd8f13c1eec640f8d7bed4ac", +"size": 51512016 }, { "algorithm": "sha512", diff --git a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest index ec36c60ea1a4..d42e7fc1da69 100644 --- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest @@ -58,8 +58,8 @@ "visibility": "public", "filename": "gradle-dist.tar.xz", "unpack": true, -"digest": "990edc0e4039dbe5f77790ef59dc0d58faebbb8c82ee497615c7991eec99fe4668d0ab05508c48664b635ff6c0cfd4272db464ae1efaa548e471ab451fe0944f", -"size": 51955340 +"digest": "36f961f85b0be846cc9e72bfa0dd1f74e7da8ef785717ce4fd102fec977f21f8902c233b28a21c1ce3797eb2759c7a74c5f74e47bd8f13c1eec640f8d7bed4ac", +"size": 51512016 }, { "size": 30899096, diff --git a/mobile/android/config/tooltool-manifests/android/releng.manifest b/mobile/android/config/tooltool-manifests/android/releng.manifest index 57d7b49588b0..ff2209a3e62f 100644 --- a/mobile/android/config/tooltool-manifests/android/releng.manifest +++ b/mobile/android/config/tooltool-manifests/android/releng.manifest @@ -68,8 +68,8 @@ "visibility": "public", "filename": "gradle-dist.tar.xz", "unpack": true, -"digest": "990edc0e4039dbe5f77790ef59dc0d58faebbb8c82ee497615c7991eec99fe4668d0ab05508c48664b635ff6c0cfd4272db464ae1efaa548e471ab451fe0944f", -"size": 51955340 +"digest": "36f961f85b0be846cc9e72bfa0dd1f74e7da8ef785717ce4fd102fec977f21f8902c233b28a21c1ce3797eb2759c7a74c5f74e47bd8f13c1eec640f8d7bed4ac", +"size": 51512016 }, { "version": "rustc 1.11.0 (9b21dcd6a 2016-08-15) repack", diff --git a/testing/docker/android-gradle-build/bin/after.sh b/testing/docker/android-gradle-build/bin/after.sh index 94b92c9a00b2..5fbbfa7017ee 100644 --- a/testing/docker/android-gradle-build/bin/after.sh +++ b/testing/docker/android-gradle-build/bin/after.sh @@ -3,7 +3,7 @@ set -x -e : WORKSPACE ${WORKSPACE:=/workspace} -: GRADLE_VERSION ${GRADLE_VERSION:=2.10} +: GRADLE_VERSION ${GRADLE_VERSION:=2.14.1} set -v