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 1817111677 for ; Wed, 24 Sep 2014 20:19:40 +0000 (UTC) Received: (qmail 144 invoked by uid 500); 24 Sep 2014 20:19:40 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 99953 invoked by uid 500); 24 Sep 2014 20:19:40 -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 99834 invoked by uid 99); 24 Sep 2014 20:19:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Sep 2014 20:19:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ADD589A391C; Wed, 24 Sep 2014 20:19:39 +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: Wed, 24 Sep 2014 20:19:41 -0000 Message-Id: In-Reply-To: <59d62769c729481497b75962c851e362@git.apache.org> References: <59d62769c729481497b75962c851e362@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] android commit: Added gradle distribution URL updating. (commit fix-up) Added gradle distribution URL updating. (commit fix-up) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/a986e723 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/a986e723 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/a986e723 Branch: refs/heads/4.0.x Commit: a986e723384cb7d9e8aeb6b273fd467f827ffb03 Parents: 162d9b6 Author: Max Woghiren Authored: Mon Sep 22 16:04:24 2014 -0400 Committer: Andrew Grieve Committed: Wed Sep 24 16:18:18 2014 -0400 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/a986e723/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 7fc36d7..85a6e7c 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -239,8 +239,7 @@ 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. - // For some reason, using ^ and $ don't work. This does the job, though. - var distributionUrlRegex = /distributionUrl.*zip/; + var distributionUrlRegex = '/^distributionUrl=.*$/'; 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);