cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [6/7] android commit: Added gradle distribution URL updating.
Date Tue, 23 Sep 2014 02:35:52 GMT
Added gradle distribution URL updating.

Conflicts:
	bin/templates/cordova/lib/build.js
	framework/build.gradle


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

Branch: refs/heads/4.0.x
Commit: ddac192c4a3a32e57d0c11159b895c94fc9b2905
Parents: 69a03c2
Author: Max Woghiren <max.woghiren@gmail.com>
Authored: Mon Sep 22 16:04:24 2014 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Mon Sep 22 22:27:43 2014 -0400

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 8 ++++++++
 framework/build.gradle             | 1 +
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ddac192c/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 5fc378c..89556fe 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -223,6 +223,14 @@ 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 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 gradleWrapperPropertiesPath = path.join(projectPath, 'gradle', 'wrapper',
'gradle-wrapper.properties');
+                shell.sed('-i', distributionUrlRegex, distributionUrl, gradleWrapperPropertiesPath);
+
                 // Update the version of build.gradle in each dependent library.
                 var pluginBuildGradle = path.join(projectPath, 'cordova', 'lib', 'plugin-build.gradle');
                 var subProjects = extractSubProjectPaths();

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ddac192c/framework/build.gradle
----------------------------------------------------------------------
diff --git a/framework/build.gradle b/framework/build.gradle
index e9d06ea..b9e9cdf 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -32,6 +32,7 @@ buildscript {
         // * framework/build.gradle
         // * bin/templates/project/cordova.gradle
         // * bin/templates/cordova/lib/plugin-build.gradle
+        // * distributionUrl within bin/templates/cordova/lib/build.js.
         classpath 'com.android.tools.build:gradle:0.12.+'
     }
 }


Mime
View raw message