From 6b6e887c2f06ea0d4fc831f028efee4710e87339 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Mon, 22 Dec 2014 11:37:06 -0500 Subject: [PATCH] CB-8143 Use gradle 2.2.1 instead of 1.12 to appease Android Studio 1.0 warning-on-startup --- bin/templates/cordova/lib/build.js | 4 ++-- bin/templates/project/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 461af3b0..42235706 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -238,11 +238,11 @@ var builders = { shell.mkdir('-p', path.join(projectPath, 'gradle')); shell.cp('-r', path.join(wrapperDir, 'gradle', 'wrapper'), path.join(projectPath, 'gradle')); - // If the gradle distribution URL is set, make sure it points to version 1.12. + // If the gradle distribution URL is set, make sure it points to version we want. // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with. // For some reason, using ^ and $ don't work. This does the job, though. var distributionUrlRegex = /distributionUrl.*zip/; - var distributionUrl = 'distributionUrl=http\\://services.gradle.org/distributions/gradle-1.12-all.zip'; + var distributionUrl = 'distributionUrl=http\\://services.gradle.org/distributions/gradle-2.2.1-all.zip'; var gradleWrapperPropertiesPath = path.join(projectPath, 'gradle', 'wrapper', 'gradle-wrapper.properties'); shell.sed('-i', distributionUrlRegex, distributionUrl, gradleWrapperPropertiesPath); diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle index a8be9c43..1b92eb4d 100644 --- a/bin/templates/project/build.gradle +++ b/bin/templates/project/build.gradle @@ -51,7 +51,7 @@ buildscript { } task wrapper(type: Wrapper) { - gradleVersion = '1.12' + gradleVersion = '2.2.1' } // PLUGIN GRADLE EXTENSIONS START