cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [4/5] android commit: Added gradle distribution URL updating. (commit fix-up)
Date Wed, 24 Sep 2014 20:19:42 GMT
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 <max.woghiren@gmail.com>
Authored: Mon Sep 22 16:04:24 2014 -0400
Committer: Andrew Grieve <agrieve@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);


Mime
View raw message