Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A33011C6E for ; Tue, 23 Sep 2014 02:35:48 +0000 (UTC) Received: (qmail 69682 invoked by uid 500); 23 Sep 2014 02:35:48 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 69614 invoked by uid 500); 23 Sep 2014 02:35:48 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 69353 invoked by uid 99); 23 Sep 2014 02:35:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 02:35:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7FB138A6C63; Tue, 23 Sep 2014 02:35:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Tue, 23 Sep 2014 02:35:52 -0000 Message-Id: <06463521a9ac405088e6dd4d0b2b24fc@git.apache.org> In-Reply-To: <79cb7f25484e4210ae1c115dca73acde@git.apache.org> References: <79cb7f25484e4210ae1c115dca73acde@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/7] android commit: Added gradle distribution URL updating. Added gradle distribution URL updating. Conflicts: bin/templates/cordova/lib/build.js framework/build.gradle Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ddac192c Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ddac192c Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ddac192c Branch: refs/heads/4.0.x Commit: ddac192c4a3a32e57d0c11159b895c94fc9b2905 Parents: 69a03c2 Author: Max Woghiren Authored: Mon Sep 22 16:04:24 2014 -0400 Committer: Andrew Grieve Committed: Mon Sep 22 22:27:43 2014 -0400 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 8 ++++++++ framework/build.gradle | 1 + 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ddac192c/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 5fc378c..89556fe 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(); http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ddac192c/framework/build.gradle ---------------------------------------------------------------------- diff --git a/framework/build.gradle b/framework/build.gradle index e9d06ea..b9e9cdf 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.+' } }