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 7D77C17798 for ; Wed, 28 Jan 2015 14:58:56 +0000 (UTC) Received: (qmail 25172 invoked by uid 500); 28 Jan 2015 14:58:55 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 25116 invoked by uid 500); 28 Jan 2015 14:58:55 -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 24406 invoked by uid 99); 28 Jan 2015 14:58:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jan 2015 14:58:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5813FE0F76; Wed, 28 Jan 2015 14:58:52 +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, 28 Jan 2015 14:59:00 -0000 Message-Id: <893cf1d622ef46f1b13f0d6558fb0e0c@git.apache.org> In-Reply-To: <59ed5c2c3de641fd9b5294e70076860f@git.apache.org> References: <59ed5c2c3de641fd9b5294e70076860f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/50] [abbrv] android commit: CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/9d3c1306 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/9d3c1306 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/9d3c1306 Branch: refs/heads/master Commit: 9d3c13065bcb580ae9222008065b93d6e3df0453 Parents: 4859f8f Author: Mark Koudritsky Authored: Thu Nov 6 15:38:48 2014 -0500 Committer: Mark Koudritsky Committed: Thu Nov 6 18:27:36 2014 -0500 ---------------------------------------------------------------------- bin/templates/project/build.gradle | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9d3c1306/bin/templates/project/build.gradle ---------------------------------------------------------------------- diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle index b62a258..ca86c28 100644 --- a/bin/templates/project/build.gradle +++ b/bin/templates/project/build.gradle @@ -56,7 +56,7 @@ android { } defaultConfig { - versionCode Integer.parseInt(System.env.ANDROID_VERSION_CODE ?: ("" + getVersionCodeFromManifest() + "0")) + versionCode Integer.parseInt(System.env.ANDROID_VERSION_CODE ?: ("" + getIntFromManifest("versionCode") + "0")) } compileSdkVersion cordova.cordovaSdkVersion @@ -82,6 +82,8 @@ android { } } } + } else if (getIntFromManifest("minSdkVersion") >= 20) { + defaultConfig.versionCode += 9 } compileOptions { @@ -163,9 +165,9 @@ gradle.taskGraph.whenReady { taskGraph -> } } -def getVersionCodeFromManifest() { +def getIntFromManifest(name) { def manifestFile = file(android.sourceSets.main.manifest.srcFile) - def pattern = Pattern.compile("versionCode=\"(\\d+)\"") + def pattern = Pattern.compile(name + "=\"(\\d+)\"") def matcher = pattern.matcher(manifestFile.getText()) matcher.find() return Integer.parseInt(matcher.group(1)) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org