cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject android commit: Revert Gradle distributionUrlRegex cleanup.
Date Tue, 09 Dec 2014 19:25:07 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/master 66fa12a09 -> ffd14fe7d


Revert Gradle distributionUrlRegex cleanup.

This reverts commit 75a0a6752a77e2e0f491ae4de7137f5163c7a4bd.


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ffd14fe7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ffd14fe7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ffd14fe7

Branch: refs/heads/master
Commit: ffd14fe7d95161f98ce88dc9f8b58046a51bbd79
Parents: 66fa12a
Author: Brian Geppert <briangeppert@briangeppert.com>
Authored: Tue Dec 9 11:57:29 2014 -0600
Committer: Max Woghiren <max.woghiren@gmail.com>
Committed: Tue Dec 9 14:23:38 2014 -0500

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ffd14fe7/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 0d4d004..fead206 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -239,7 +239,8 @@ 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.
-                var distributionUrlRegex = '/^distributionUrl=.*$/';
+                // 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 gradleWrapperPropertiesPath = path.join(projectPath, 'gradle', 'wrapper',
'gradle-wrapper.properties');
                 shell.sed('-i', distributionUrlRegex, distributionUrl, gradleWrapperPropertiesPath);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message