[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
Github user asfgit closed the pull request at: https://github.com/apache/cordova-android/pull/182 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
Github user imaffett commented on the pull request: https://github.com/apache/cordova-android/pull/182#issuecomment-119226952 @tony-- is swamped right now with other priorities. Would it be possible for someone else to merge this? We're dependent on it for a few of our plugins and us to upgrade to CLI 5. thanks! --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
Github user tony-- commented on the pull request: https://github.com/apache/cordova-android/pull/182#issuecomment-111531613 thanks for the feedback - addressed nits in ammended commit --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
Github user agrieve commented on the pull request: https://github.com/apache/cordova-android/pull/182#issuecomment-111340031 a few nits, but LGTM! Thanks for doing this. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
Github user agrieve commented on a diff in the pull request:
https://github.com/apache/cordova-android/pull/182#discussion_r3228
--- Diff: bin/templates/cordova/lib/build.js ---
@@ -102,6 +102,19 @@ function hasCustomRules() {
return fs.existsSync(path.join(ROOT, 'custom_rules.xml'));
}
+function extractRealProjectNameFromManifest(projectPath) {
+var manifestPath = path.join(projectPath, 'AndroidManifest.xml');
+var manifestData = fs.readFileSync(manifestPath, 'utf8');
+var m = /
[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
Github user agrieve commented on a diff in the pull request:
https://github.com/apache/cordova-android/pull/182#discussion_r32287669
--- Diff: bin/templates/cordova/lib/build.js ---
@@ -245,18 +258,29 @@ var builders = {
}
}
+var name=extractRealProjectNameFromManifest(ROOT);
var subProjectsAsGradlePaths = subProjects.map(function(p) {
return ':' + p.replace(/[/\\]/g, ':'); });
+//Remove the proj.id/name- prefix from projects
--- End diff --
nit: add a link to the JIRA here since it's not obvious why we're doing it.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
Github user agrieve commented on a diff in the pull request:
https://github.com/apache/cordova-android/pull/182#discussion_r32287653
--- Diff: bin/templates/cordova/lib/build.js ---
@@ -245,18 +258,29 @@ var builders = {
}
}
+var name=extractRealProjectNameFromManifest(ROOT);
var subProjectsAsGradlePaths = subProjects.map(function(p) {
return ':' + p.replace(/[/\\]/g, ':'); });
+//Remove the proj.id/name- prefix from projects
+var settingsGradlePaths = subProjects.map(function(p){
+var realDir=p.replace(/[/\\]/g, ':');
+var libName=realDir.replace(name+'-','');
+var str='include ":'+libName+'"\n';
+if(realDir.indexOf(name+'-')!==-1)
+str+='project(":'+libName+'").projectDir = new
File("'+p+'")\n';
+return str;
+});
+
// 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');
+'include ":"\n' + settingsGradlePaths.join(''));
// Update dependencies within build.gradle.
var buildGradle = fs.readFileSync(path.join(projectPath,
'build.gradle'), 'utf8');
var depsList = '';
subProjectsAsGradlePaths.forEach(function(p) {
--- End diff --
nit: delete subProjectsAsGradlePaths, and just loop on subProjects here.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-9149: Make gradle alias subprojec...
GitHub user tony-- opened a pull request: https://github.com/apache/cordova-android/pull/182 CB-9149: Make gradle alias subprojects in order to handle libs that d⦠â¦epend on libs You can merge this pull request into a Git repository by running: $ git pull https://github.com/tony--/cordova-android CB-9149 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-android/pull/182.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #182 commit 7ac9b14328196109df2f19d35b6625cd807bac95 Author: Tony Homer Date: 2015-06-10T04:57:01Z CB-9149: Make gradle alias subprojects in order to handle libs that depend on libs --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
