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 03:12:18 UTC
[1/7] android commit: gradle: Write sub-project list explicitly to
make Android Studio happy
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x 75a0a6752 -> f7f49d27c
refs/heads/master ddac192c4 -> 9e3ccf4b3
gradle: Write sub-project list explicitly to make Android Studio happy
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/0d313a39
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/0d313a39
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/0d313a39
Branch: refs/heads/4.0.x
Commit: 0d313a39645cc4329435eaf70c3ba2c17e18f525
Parents: ddac192
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:03:00 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:03:00 2014 -0400
----------------------------------------------------------------------
bin/lib/create.js | 1 -
bin/templates/cordova/lib/build.js | 16 ++++++++++++++++
bin/templates/project/build.gradle | 20 ++++----------------
bin/templates/project/settings.gradle | 18 ------------------
4 files changed, 20 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index c045819..bfe6b23 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -122,7 +122,6 @@ function copyBuildRules(projectPath) {
shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
- shell.cp('-f', path.join(srcDir, 'settings.gradle'), projectPath);
shell.cp('-f', path.join(srcDir, 'cordova.gradle'), projectPath);
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 89556fe..c5b6b09 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -237,6 +237,22 @@ var builders = {
for (var i = 0; i < subProjects.length; ++i) {
shell.cp('-f', pluginBuildGradle, path.join(ROOT, subProjects[i], 'build.gradle'));
}
+
+ var subProjectsAsGradlePaths = subProjects.map(function(p) { return ':' + p.replace(/[/\\]/g, ':') });
+ // Write the settings.gradle file.
+ fs.writeFileSync(path.join(projectPath, 'settings.gradle'),
+ '// GENERATED FILE - DO NOT EDIT\n' +
+ 'include ":"\n' +
+ 'include "' + subProjectsAsGradlePaths.join('"\ninclude "') + '"\n');
+ // Update dependencies within build.gradle.
+ var buildGradle = fs.readFileSync(path.join(projectPath, 'build.gradle'), 'utf8');
+ var depsList = '';
+ subProjectsAsGradlePaths.forEach(function(p) {
+ depsList += ' debugCompile project(path: "' + p + '", configuration: "debug")\n';
+ depsList += ' releaseCompile project(path: "' + p + '", configuration: "release")\n';
+ });
+ buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + depsList + ' $2');
+ fs.writeFileSync(path.join(projectPath, 'build.gradle'), buildGradle);
});
},
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 41984fa..ce59e32 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -17,6 +17,8 @@
under the License.
*/
+// GENERATED FILE! DO NOT EDIT!
+
import java.util.regex.Pattern
import groovy.swing.SwingBuilder
@@ -111,11 +113,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
- // https://code.google.com/p/android/issues/detail?id=52962
- for (subproject in getProjectList()) {
- releaseCompile project(path: subproject, configuration: 'release')
- debugCompile project(path: subproject, configuration: 'debug')
- }
+ // SUB-PROJECT DEPENDENCIES START
+ // SUB-PROJECT DEPENDENCIES END
}
@@ -172,17 +171,6 @@ def getVersionCodeFromManifest() {
return Integer.parseInt(matcher.group(1))
}
-def getProjectList() {
- def manifestFile = file("project.properties")
- def pattern = Pattern.compile("android.library.reference.(\\d+)\\s*=\\s*(.*)")
- def matcher = pattern.matcher(manifestFile.getText())
- def projects = []
- while (matcher.find()) {
- projects.add(":" + matcher.group(2).replace("/",":"))
- }
- return projects
-}
-
def ensureValueExists(filePath, props, key) {
if (props.get(key) == null) {
throw new GradleException(filePath + ': Missing key required "' + key + '"')
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/templates/project/settings.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/settings.gradle b/bin/templates/project/settings.gradle
deleted file mode 100644
index baa1714..0000000
--- a/bin/templates/project/settings.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-import java.util.regex.Pattern
-
-def getProjectList() {
- def manifestFile = file("project.properties")
- def pattern = Pattern.compile("android.library.reference.(\\d+)\\s*=\\s*(.*)")
- def matcher = pattern.matcher(manifestFile.getText())
- def projects = []
- while (matcher.find()) {
- projects.add(":" + matcher.group(2).replace("/",":"))
- }
- return projects
-}
-
-for (subproject in getProjectList()) {
- include subproject
-}
-
-include ':'
[7/7] android commit: Merge branch 'master' into 4.0.x (gradle
Android Studio)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (gradle Android Studio)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f7f49d27
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f7f49d27
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f7f49d27
Branch: refs/heads/4.0.x
Commit: f7f49d27c5a962378cda472406e5ffd09c8a8d9c
Parents: 75a0a67 9e3ccf4
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:04:55 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:04:55 2014 -0400
----------------------------------------------------------------------
bin/lib/create.js | 1 -
bin/templates/cordova/lib/build.js | 16 ++++++++++++++++
bin/templates/project/build.gradle | 23 +++++++----------------
bin/templates/project/cordova.gradle | 4 ++--
bin/templates/project/settings.gradle | 18 ------------------
5 files changed, 25 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f7f49d27/bin/lib/create.js
----------------------------------------------------------------------
diff --cc bin/lib/create.js
index fd962b4,bfe6b23..4fa600c
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@@ -119,9 -119,9 +119,8 @@@ function writeProjectProperties(project
function copyBuildRules(projectPath) {
var srcDir = path.join(ROOT, 'bin', 'templates', 'project');
- shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
- shell.cp('-f', path.join(srcDir, 'settings.gradle'), projectPath);
shell.cp('-f', path.join(srcDir, 'cordova.gradle'), projectPath);
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f7f49d27/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
[3/7] android commit: gradle: Have project's build.gradle look for a
build-extras.gradle
Posted by ag...@apache.org.
gradle: Have project's build.gradle look for a build-extras.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/6b71c2f3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6b71c2f3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6b71c2f3
Branch: refs/heads/master
Commit: 6b71c2f392c8a5ee2ad9acf11a81e0de945032a7
Parents: 0d313a3
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:03:17 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:03:17 2014 -0400
----------------------------------------------------------------------
bin/templates/project/build.gradle | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b71c2f3/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index ce59e32..2e4d5cb 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -190,3 +190,6 @@ def addSigningProps(propsFilePath, signingConfig) {
}
}
+if (file('build-extras.gradle').exists()) {
+ apply from: 'build-extras.gradle'
+}
[4/7] android commit: gradle: Have project's build.gradle look for a
build-extras.gradle
Posted by ag...@apache.org.
gradle: Have project's build.gradle look for a build-extras.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/6b71c2f3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6b71c2f3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6b71c2f3
Branch: refs/heads/4.0.x
Commit: 6b71c2f392c8a5ee2ad9acf11a81e0de945032a7
Parents: 0d313a3
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:03:17 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:03:17 2014 -0400
----------------------------------------------------------------------
bin/templates/project/build.gradle | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6b71c2f3/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index ce59e32..2e4d5cb 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -190,3 +190,6 @@ def addSigningProps(propsFilePath, signingConfig) {
}
}
+if (file('build-extras.gradle').exists()) {
+ apply from: 'build-extras.gradle'
+}
[2/7] android commit: gradle: Write sub-project list explicitly to
make Android Studio happy
Posted by ag...@apache.org.
gradle: Write sub-project list explicitly to make Android Studio happy
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/0d313a39
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/0d313a39
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/0d313a39
Branch: refs/heads/master
Commit: 0d313a39645cc4329435eaf70c3ba2c17e18f525
Parents: ddac192
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:03:00 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:03:00 2014 -0400
----------------------------------------------------------------------
bin/lib/create.js | 1 -
bin/templates/cordova/lib/build.js | 16 ++++++++++++++++
bin/templates/project/build.gradle | 20 ++++----------------
bin/templates/project/settings.gradle | 18 ------------------
4 files changed, 20 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/lib/create.js
----------------------------------------------------------------------
diff --git a/bin/lib/create.js b/bin/lib/create.js
index c045819..bfe6b23 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -122,7 +122,6 @@ function copyBuildRules(projectPath) {
shell.cp('-f', path.join(srcDir, 'custom_rules.xml'), projectPath);
shell.cp('-f', path.join(srcDir, 'build.gradle'), projectPath);
- shell.cp('-f', path.join(srcDir, 'settings.gradle'), projectPath);
shell.cp('-f', path.join(srcDir, 'cordova.gradle'), projectPath);
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js
index 89556fe..c5b6b09 100644
--- a/bin/templates/cordova/lib/build.js
+++ b/bin/templates/cordova/lib/build.js
@@ -237,6 +237,22 @@ var builders = {
for (var i = 0; i < subProjects.length; ++i) {
shell.cp('-f', pluginBuildGradle, path.join(ROOT, subProjects[i], 'build.gradle'));
}
+
+ var subProjectsAsGradlePaths = subProjects.map(function(p) { return ':' + p.replace(/[/\\]/g, ':') });
+ // Write the settings.gradle file.
+ fs.writeFileSync(path.join(projectPath, 'settings.gradle'),
+ '// GENERATED FILE - DO NOT EDIT\n' +
+ 'include ":"\n' +
+ 'include "' + subProjectsAsGradlePaths.join('"\ninclude "') + '"\n');
+ // Update dependencies within build.gradle.
+ var buildGradle = fs.readFileSync(path.join(projectPath, 'build.gradle'), 'utf8');
+ var depsList = '';
+ subProjectsAsGradlePaths.forEach(function(p) {
+ depsList += ' debugCompile project(path: "' + p + '", configuration: "debug")\n';
+ depsList += ' releaseCompile project(path: "' + p + '", configuration: "release")\n';
+ });
+ buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + depsList + ' $2');
+ fs.writeFileSync(path.join(projectPath, 'build.gradle'), buildGradle);
});
},
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 41984fa..ce59e32 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -17,6 +17,8 @@
under the License.
*/
+// GENERATED FILE! DO NOT EDIT!
+
import java.util.regex.Pattern
import groovy.swing.SwingBuilder
@@ -111,11 +113,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
- // https://code.google.com/p/android/issues/detail?id=52962
- for (subproject in getProjectList()) {
- releaseCompile project(path: subproject, configuration: 'release')
- debugCompile project(path: subproject, configuration: 'debug')
- }
+ // SUB-PROJECT DEPENDENCIES START
+ // SUB-PROJECT DEPENDENCIES END
}
@@ -172,17 +171,6 @@ def getVersionCodeFromManifest() {
return Integer.parseInt(matcher.group(1))
}
-def getProjectList() {
- def manifestFile = file("project.properties")
- def pattern = Pattern.compile("android.library.reference.(\\d+)\\s*=\\s*(.*)")
- def matcher = pattern.matcher(manifestFile.getText())
- def projects = []
- while (matcher.find()) {
- projects.add(":" + matcher.group(2).replace("/",":"))
- }
- return projects
-}
-
def ensureValueExists(filePath, props, key) {
if (props.get(key) == null) {
throw new GradleException(filePath + ': Missing key required "' + key + '"')
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/0d313a39/bin/templates/project/settings.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/settings.gradle b/bin/templates/project/settings.gradle
deleted file mode 100644
index baa1714..0000000
--- a/bin/templates/project/settings.gradle
+++ /dev/null
@@ -1,18 +0,0 @@
-import java.util.regex.Pattern
-
-def getProjectList() {
- def manifestFile = file("project.properties")
- def pattern = Pattern.compile("android.library.reference.(\\d+)\\s*=\\s*(.*)")
- def matcher = pattern.matcher(manifestFile.getText())
- def projects = []
- while (matcher.find()) {
- projects.add(":" + matcher.group(2).replace("/",":"))
- }
- return projects
-}
-
-for (subproject in getProjectList()) {
- include subproject
-}
-
-include ':'
[6/7] android commit: gradle: Fix warning about dynamic properties
being deprecated
Posted by ag...@apache.org.
gradle: Fix warning about dynamic properties being deprecated
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/9e3ccf4b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/9e3ccf4b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/9e3ccf4b
Branch: refs/heads/master
Commit: 9e3ccf4b3eafaf2f2a073a305af2aef729a3f8a9
Parents: 6b71c2f
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:04:04 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:04:04 2014 -0400
----------------------------------------------------------------------
bin/templates/project/cordova.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9e3ccf4b/bin/templates/project/cordova.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index ec597b2..cf2daca 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -115,6 +115,6 @@ String getAndroidSdkDir() {
androidSdkDir
}
-cordovaSdkVersion = System.env.MIN_SDK_VERSION ?: getProjectTarget("android-19")
-cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")
+ext.cordovaSdkVersion = System.env.MIN_SDK_VERSION ?: getProjectTarget("android-19")
+ext.cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")
[5/7] android commit: gradle: Fix warning about dynamic properties
being deprecated
Posted by ag...@apache.org.
gradle: Fix warning about dynamic properties being deprecated
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/9e3ccf4b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/9e3ccf4b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/9e3ccf4b
Branch: refs/heads/4.0.x
Commit: 9e3ccf4b3eafaf2f2a073a305af2aef729a3f8a9
Parents: 6b71c2f
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Sep 23 21:04:04 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Sep 23 21:04:04 2014 -0400
----------------------------------------------------------------------
bin/templates/project/cordova.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9e3ccf4b/bin/templates/project/cordova.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova.gradle b/bin/templates/project/cordova.gradle
index ec597b2..cf2daca 100644
--- a/bin/templates/project/cordova.gradle
+++ b/bin/templates/project/cordova.gradle
@@ -115,6 +115,6 @@ String getAndroidSdkDir() {
androidSdkDir
}
-cordovaSdkVersion = System.env.MIN_SDK_VERSION ?: getProjectTarget("android-19")
-cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")
+ext.cordovaSdkVersion = System.env.MIN_SDK_VERSION ?: getProjectTarget("android-19")
+ext.cordovaBuildToolsVersion = latestBuildToolsAvailable("19.1.0")