github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 12:03:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-11083: Reading files to check for CordovaLib dependency, if so, we exclude CordovaLib to be safe

Browse Source
This commit is contained in:
Joe Bowser 2016-07-18 15:12:47 -07:00
parent 263968e019
commit 304cbef5ed
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bin/templates/cordova/lib/builders/GradleBuilder.js vendored
View File

@ -71,16 +71,17 @@ GradleBuilder.prototype.prepBuildFiles = function() {
var pluginBuildGradle = path.join(this.root, 'cordova', 'lib', 'plugin-build.gradle'); var pluginBuildGradle = path.join(this.root, 'cordova', 'lib', 'plugin-build.gradle');
var propertiesObj = this.readProjectProperties(); var propertiesObj = this.readProjectProperties();
var subProjects = propertiesObj.libs; var subProjects = propertiesObj.libs;
for (var i = 0; i < subProjects.length; ++i) { var checkAndCopy = function(subProject, root) {
if (subProjects[i] !== 'CordovaLib') { var subProjectGradle = path.join(root, subProject, 'build.gradle');
var subProjectGradle = path.join(this.root, subProjects[i], 'build.gradle'); fs.exists(subProject, function(exists) {
// Only copy the gradle if it doesn't exist for the library if (!exists) {
fs.exists(subProjectGradle, function(exists) { shell.cp('-f', pluginBuildGradle, subProjectGradle);
if (!exists)
{
shell.cp('-f', pluginBuildGradle, path.join(this.root, subProjects[i], 'build.gradle'));
} }
}); });
};
for (var i = 0; i < subProjects.length; ++i) {
if (subProjects[i] !== 'CordovaLib') {
checkAndCopy(subProjects[i], this.root);
} }
} }
var name = this.extractRealProjectNameFromManifest(); var name = this.extractRealProjectNameFromManifest();
@ -101,20 +102,24 @@ GradleBuilder.prototype.prepBuildFiles = function() {
// Update dependencies within build.gradle. // Update dependencies within build.gradle.
var buildGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8'); var buildGradle = fs.readFileSync(path.join(this.root, 'build.gradle'), 'utf8');
var depsList = ''; var depsList = '';
var insertExclude = function(libName) { var root = this.root;
if(libName.indexOf("cordova-plugin") != -1) { 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'; depsList += '{\n exclude module:("CordovaLib")\n }\n';
} }
else { else {
depsList += "\n"; depsList +='\n';
}
} }
};
subProjects.forEach(function(p) { subProjects.forEach(function(p) {
console.log('Subproject Path: ' + p);
var libName=p.replace(/[/\\]/g, ':').replace(name+'-',''); var libName=p.replace(/[/\\]/g, ':').replace(name+'-','');
depsList += ' debugCompile(project(path: "' + libName + '", configuration: "debug"))'; depsList += ' debugCompile(project(path: "' + libName + '", configuration: "debug"))';
insertExclude(libName); insertExclude(p);
depsList += ' releaseCompile(project(path: "' + libName + '", configuration: "release"))'; 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 // For why we do this mapping: https://issues.apache.org/jira/browse/CB-8390
var SYSTEM_LIBRARY_MAPPINGS = [ var SYSTEM_LIBRARY_MAPPINGS = [