You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/10/19 16:50:00 UTC
[1/5] android commit: CB-11083: Reading files to check for CordovaLib
dependency, if so, we exclude CordovaLib to be safe
Repository: cordova-android
Updated Branches:
refs/heads/master 0b710a86a -> 6aa4b1b30
CB-11083: Reading files to check for CordovaLib dependency, if so, we exclude CordovaLib to be safe
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/304cbef5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/304cbef5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/304cbef5
Branch: refs/heads/master
Commit: 304cbef5ed91ef5f76b39d3fee135d224b0adb1e
Parents: 263968e
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Jul 18 15:12:47 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Oct 19 09:49:39 2016 -0700
----------------------------------------------------------------------
.../cordova/lib/builders/GradleBuilder.js | 41 +++++++++++---------
1 file changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/304cbef5/bin/templates/cordova/lib/builders/GradleBuilder.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js
index 78b567c..6241091 100644
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -71,16 +71,17 @@ GradleBuilder.prototype.prepBuildFiles = function() {
var pluginBuildGradle = path.join(this.root, 'cordova', 'lib', 'plugin-build.gradle');
var propertiesObj = this.readProjectProperties();
var subProjects = propertiesObj.libs;
+ var checkAndCopy = function(subProject, root) {
+ var subProjectGradle = path.join(root, subProject, 'build.gradle');
+ fs.exists(subProject, function(exists) {
+ if (!exists) {
+ shell.cp('-f', pluginBuildGradle, subProjectGradle);
+ }
+ });
+ };
for (var i = 0; i < subProjects.length; ++i) {
if (subProjects[i] !== 'CordovaLib') {
- var subProjectGradle = path.join(this.root, subProjects[i], 'build.gradle');
- // Only copy the gradle if it doesn't exist for the library
- fs.exists(subProjectGradle, function(exists) {
- if (!exists)
- {
- shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle'));
- }
- });
+ checkAndCopy(subProjects[i], this.root);
}
}
var name = this.extractRealProjectNameFromManifest();
@@ -101,20 +102,24 @@ GradleBuilder.prototype.prepBuildFiles = function() {
// Update dependencies within build.gradle.
var buildGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8');
var depsList = '';
- var insertExclude = function(libName) {
- if(libName.indexOf("cordova-plugin") != -1) {
- depsList += '{\n exclude module:("CordovaLib")\n }\n';
- }
- else {
- depsList += "\n";
- }
- }
+ var root = this.root;
+ var insertExclude = function(p) {
+ var gradlePath = path.join(root, p, 'build.gradle');
+ var projectGradleFile = fs.readFileSync(gradlePath, 'utf-8');
+ if(projectGradleFile.indexOf('CordovaLib') != -1) {
+ depsList += '{\n exclude module:("CordovaLib")\n }\n';
+ }
+ else {
+ depsList +='\n';
+ }
+ };
subProjects.forEach(function(p) {
+ console.log('Subproject Path: ' + p);
var libName=p.replace(/[/\\]/g, ':').replace(name+'-','');
depsList += ' debugCompile(project(path: "' + libName + '", configuration: "debug"))';
- insertExclude(libName);
+ insertExclude(p);
depsList += ' releaseCompile(project(path: "' + libName + '", configuration: "release"))';
- insertExclude(libName);
+ insertExclude(p);
});
// For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390
var SYSTEM_LIBRARY_MAPPINGS = [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/5] android commit: CB-11083: Fixing syncronous file check and
future-proofing the JS for Travis
Posted by bo...@apache.org.
CB-11083: Fixing syncronous file check and future-proofing the JS for Travis
This closes #323
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/6aa4b1b3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/6aa4b1b3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/6aa4b1b3
Branch: refs/heads/master
Commit: 6aa4b1b301889c91656469d233e2fde93f150834
Parents: 304cbef
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Aug 10 15:29:24 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Oct 19 09:49:42 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/builders/GradleBuilder.js | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/6aa4b1b3/bin/templates/cordova/lib/builders/GradleBuilder.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js
index 6241091..8d6e76b 100644
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -73,11 +73,13 @@ GradleBuilder.prototype.prepBuildFiles = function() {
var subProjects = propertiesObj.libs;
var checkAndCopy = function(subProject, root) {
var subProjectGradle = path.join(root, subProject, 'build.gradle');
- fs.exists(subProject, function(exists) {
- if (!exists) {
+ // This is the future-proof way of checking if a file exists
+ // This must be synchronous to satisfy a Travis test
+ try {
+ fs.accessSync(subProjectGradle, fs.F_OK);
+ } catch (e) {
shell.cp('-f', pluginBuildGradle, subProjectGradle);
- }
- });
+ }
};
for (var i = 0; i < subProjects.length; ++i) {
if (subProjects[i] !== 'CordovaLib') {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/5] android commit: CB-11083: Plugin build script for dependencies
without a gradle file
Posted by bo...@apache.org.
CB-11083: Plugin build script for dependencies without a gradle file
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/263968e0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/263968e0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/263968e0
Branch: refs/heads/master
Commit: 263968e0191337bd033ece220465308913cdaaa5
Parents: c05521e
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Jun 29 10:48:37 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Oct 19 09:49:39 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/plugin-build.gradle | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/263968e0/bin/templates/cordova/lib/plugin-build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/plugin-build.gradle b/bin/templates/cordova/lib/plugin-build.gradle
index f3e9ead..d1c6336 100644
--- a/bin/templates/cordova/lib/plugin-build.gradle
+++ b/bin/templates/cordova/lib/plugin-build.gradle
@@ -21,24 +21,15 @@
buildscript {
repositories {
mavenCentral()
+ jcenter()
}
// Switch the Android Gradle plugin version requirement depending on the
// installed version of Gradle. This dependency is documented at
// http://tools.android.com/tech-docs/new-build-system/version-compatibility
// and https://issues.apache.org/jira/browse/CB-8143
- if (gradle.gradleVersion >= "2.2") {
- dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0+'
- }
- } else if (gradle.gradleVersion >= "2.1") {
- dependencies {
- classpath 'com.android.tools.build:gradle:0.14.0+'
- }
- } else {
- dependencies {
- classpath 'com.android.tools.build:gradle:0.12.0+'
- }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.0.0+'
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/5] android commit: CB-11083 Fix to deal with custom frameworks
with their own Gradle configuration
Posted by bo...@apache.org.
CB-11083 Fix to deal with custom frameworks with their own Gradle configuration
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2f3c71fe
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2f3c71fe
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2f3c71fe
Branch: refs/heads/master
Commit: 2f3c71feaa4befe9c33b6a700502aa6b43a21d54
Parents: 0b710a8
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jun 7 16:06:40 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Oct 19 09:49:39 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/builders/GradleBuilder.js | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2f3c71fe/bin/templates/cordova/lib/builders/GradleBuilder.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js
index 8fb5c6b..382a851 100644
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -73,10 +73,16 @@ GradleBuilder.prototype.prepBuildFiles = function() {
var subProjects = propertiesObj.libs;
for (var i = 0; i < subProjects.length; ++i) {
if (subProjects[i] !== 'CordovaLib') {
- shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle'));
+ var subProjectGradle = path.join(this.root, subProjects[i], 'build.gradle');
+ // Only copy the gradle if it doesn't exist for the library
+ fs.exists(subProjectGradle, function(exists) {
+ if (!exists)
+ {
+ shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle'));
+ }
+ });
}
}
-
var name = this.extractRealProjectNameFromManifest();
//Remove the proj.id/name- prefix from projects: https://issues.apache.org/jira/browse/CB-9149
var settingsGradlePaths = subProjects.map(function(p){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/5] android commit: CB-11083: The GradleBuidler can tell the
difference between a Cordova Plugin Framework and a regular framework based
on the name
Posted by bo...@apache.org.
CB-11083: The GradleBuidler can tell the difference between a Cordova Plugin Framework and a regular framework based on the name
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/c05521e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/c05521e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/c05521e5
Branch: refs/heads/master
Commit: c05521e55a6d05903c213811256c7a49541cff55
Parents: 2f3c71f
Author: Joe Bowser <bo...@apache.org>
Authored: Fri Jun 10 12:34:16 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Oct 19 09:49:39 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/builders/GradleBuilder.js | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/c05521e5/bin/templates/cordova/lib/builders/GradleBuilder.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js
index 382a851..78b567c 100644
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -101,10 +101,20 @@ GradleBuilder.prototype.prepBuildFiles = function() {
// Update dependencies within build.gradle.
var buildGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8');
var depsList = '';
+ var insertExclude = function(libName) {
+ if(libName.indexOf("cordova-plugin") != -1) {
+ depsList += '{\n exclude module:("CordovaLib")\n }\n';
+ }
+ else {
+ depsList += "\n";
+ }
+ }
subProjects.forEach(function(p) {
var libName=p.replace(/[/\\]/g, ':').replace(name+'-','');
- depsList += ' debugCompile project(path: "' + libName + '", configuration: "debug")\n';
- depsList += ' releaseCompile project(path: "' + libName + '", configuration: "release")\n';
+ depsList += ' debugCompile(project(path: "' + libName + '", configuration: "debug"))';
+ insertExclude(libName);
+ depsList += ' releaseCompile(project(path: "' + libName + '", configuration: "release"))';
+ insertExclude(libName);
});
// For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390
var SYSTEM_LIBRARY_MAPPINGS = [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org