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/09/24 22:19:42 UTC
[4/5] android commit: Added gradle distribution URL updating. (commit
fix-up)
Added gradle distribution URL updating. (commit fix-up)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a986e723
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a986e723
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a986e723
Branch: refs/heads/master
Commit: a986e723384cb7d9e8aeb6b273fd467f827ffb03
Parents: 162d9b6
Author: Max Woghiren <ma...@gmail.com>
Authored: Mon Sep 22 16:04:24 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Sep 24 16:18:18 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a986e723/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 7fc36d7..85a6e7c 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -239,8 +239,7 @@ var builders = {
// If the gradle distribution URL is set, make sure it points to version 1.12.
// 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 distributionUrlRegex = '/^distributionUrl=.*$/';
var distributionUrl = 'distributionUrl=http\\://services.gradle.org/distributions/gradle-1.12-all.zip';
var gradleWrapperPropertiesPath = path.join(projectPath, 'gradle', 'wrapper', 'gradle-wrapper.properties');
shell.sed('-i', distributionUrlRegex, distributionUrl, gradleWrapperPropertiesPath);