You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/12/22 17:45:09 UTC
android commit: CB-8143 Use gradle 2.2.1 instead of 1.12 to appease
Android Studio 1.0 warning-on-startup
Repository: cordova-android
Updated Branches:
refs/heads/master b92303b1c -> 6b6e887c2
CB-8143 Use gradle 2.2.1 instead of 1.12 to appease Android Studio 1.0 warning-on-startup
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6b6e887c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6b6e887c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6b6e887c
Branch: refs/heads/master
Commit: 6b6e887c2f06ea0d4fc831f028efee4710e87339
Parents: b92303b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Dec 22 11:37:06 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Dec 22 11:37:06 2014 -0500
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 4 ++--
bin/templates/project/build.gradle | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b6e887c/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 461af3b..4223570 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);
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b6e887c/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index a8be9c4..1b92eb4 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org