diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 5fc378c4..89556fef 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -223,6 +223,14 @@ var builders = { shell.mkdir('-p', path.join(projectPath, 'gradle')); shell.cp('-r', path.join(wrapperDir, 'gradle', 'wrapper'), path.join(projectPath, 'gradle')); + // If the gradle distribution URL is set, make sure it points to version 1.12. + // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with. + // For some reason, using ^ and $ don't work. This does the job, though. + var distributionUrlRegex = /distributionUrl.*zip/; + var distributionUrl = 'distributionUrl=http\\://services.gradle.org/distributions/gradle-1.12-all.zip'; + var gradleWrapperPropertiesPath = path.join(projectPath, 'gradle', 'wrapper', 'gradle-wrapper.properties'); + shell.sed('-i', distributionUrlRegex, distributionUrl, gradleWrapperPropertiesPath); + // Update the version of build.gradle in each dependent library. var pluginBuildGradle = path.join(projectPath, 'cordova', 'lib', 'plugin-build.gradle'); var subProjects = extractSubProjectPaths(); diff --git a/framework/build.gradle b/framework/build.gradle index e9d06ea2..b9e9cdf7 100644 --- a/framework/build.gradle +++ b/framework/build.gradle @@ -32,6 +32,7 @@ buildscript { // * framework/build.gradle // * bin/templates/project/cordova.gradle // * bin/templates/cordova/lib/plugin-build.gradle + // * distributionUrl within bin/templates/cordova/lib/build.js. classpath 'com.android.tools.build:gradle:0.12.+' } }