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 95AE71080A for ; Tue, 9 Dec 2014 19:25:07 +0000 (UTC) Received: (qmail 6772 invoked by uid 500); 9 Dec 2014 19:25:07 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 6745 invoked by uid 500); 9 Dec 2014 19:25:07 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 6736 invoked by uid 99); 9 Dec 2014 19:25:07 -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, 09 Dec 2014 19:25:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 336C0A217BB; Tue, 9 Dec 2014 19:25:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: maxw@apache.org To: commits@cordova.apache.org Message-Id: <131b297d35504c7aae4b27642829111a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: android commit: Revert Gradle distributionUrlRegex cleanup. Date: Tue, 9 Dec 2014 19:25:07 +0000 (UTC) Repository: cordova-android Updated Branches: refs/heads/master 66fa12a09 -> ffd14fe7d Revert Gradle distributionUrlRegex cleanup. This reverts commit 75a0a6752a77e2e0f491ae4de7137f5163c7a4bd. Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ffd14fe7 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ffd14fe7 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ffd14fe7 Branch: refs/heads/master Commit: ffd14fe7d95161f98ce88dc9f8b58046a51bbd79 Parents: 66fa12a Author: Brian Geppert Authored: Tue Dec 9 11:57:29 2014 -0600 Committer: Max Woghiren Committed: Tue Dec 9 14:23:38 2014 -0500 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ffd14fe7/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 0d4d004..fead206 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -239,7 +239,8 @@ var builders = { // 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. - var distributionUrlRegex = '/^distributionUrl=.*$/'; + // 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); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org