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
