diff --git a/bin/lib/create.js b/bin/lib/create.js index c0d0c50f..5471bb4d 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -72,6 +72,7 @@ function copyJsAndLibrary(projectPath, shared, projectName) { shell.cp('-f', path.join(ROOT, 'framework', 'AndroidManifest.xml'), nestedCordovaLibPath); shell.cp('-f', path.join(ROOT, 'framework', 'project.properties'), nestedCordovaLibPath); shell.cp('-f', path.join(ROOT, 'framework', 'build.gradle'), nestedCordovaLibPath); + shell.cp('-f', path.join(ROOT, 'framework', 'cordova.gradle'), nestedCordovaLibPath); shell.cp('-r', path.join(ROOT, 'framework', 'src'), nestedCordovaLibPath); // Create an eclipse project file and set the name of it to something unique. // Without this, you can't import multiple CordovaLib projects into the same workspace. @@ -122,7 +123,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, 'cordova.gradle'), projectPath); } function copyScripts(projectPath) { diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle index 52bb3fdd..911ffb61 100644 --- a/bin/templates/project/build.gradle +++ b/bin/templates/project/build.gradle @@ -57,7 +57,7 @@ task wrapper(type: Wrapper) { // Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties. // Refer to: http://www.gradle.org/docs/current/userguide/tutorial_this_and_that.html ext { - apply from: 'cordova.gradle' + apply from: 'CordovaLib/cordova.gradle' // The value for android.compileSdkVersion. if (!project.hasProperty('cdvCompileSdkVersion')) { cdvCompileSdkVersion = privateHelpers.getProjectTarget('android-19') diff --git a/bin/templates/project/cordova.gradle b/framework/cordova.gradle similarity index 100% rename from bin/templates/project/cordova.gradle rename to framework/cordova.gradle