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 BA1C210173 for ; Mon, 22 Dec 2014 15:52:58 +0000 (UTC) Received: (qmail 5361 invoked by uid 500); 22 Dec 2014 15:52:58 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 5224 invoked by uid 500); 22 Dec 2014 15:52:58 -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 5039 invoked by uid 99); 22 Dec 2014 15:52:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2014 15:52:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 573E0A32BBD; Mon, 22 Dec 2014 15:52:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: naika@apache.org To: commits@cordova.apache.org Date: Mon, 22 Dec 2014 15:53:01 -0000 Message-Id: <77d5181eb2314bdfae7796b9ccd4e57a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/12] cordova-amazon-fireos git commit: CB-8143: Use the correct Android Gradle plugin for the installed Gradle version CB-8143: Use the correct Android Gradle plugin for the installed Gradle version Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/87602e30 Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/87602e30 Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/87602e30 Branch: refs/heads/master Commit: 87602e303be2df4658ef4b35a958feac544e0145 Parents: b409290 Author: Ian Clelland Authored: Wed Dec 10 10:07:05 2014 -0500 Committer: Ajitha Committed: Sat Dec 13 18:54:03 2014 +0000 ---------------------------------------------------------------------- bin/templates/project/build.gradle | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/87602e30/bin/templates/project/build.gradle ---------------------------------------------------------------------- diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle index 63ecd81..5a997e6 100644 --- a/bin/templates/project/build.gradle +++ b/bin/templates/project/build.gradle @@ -31,8 +31,18 @@ buildscript { mavenCentral() } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.0+' + // Switch the Android Gradle plugin version requirement depending on the + // installed version of Gradle. This dependency is documented at + // http://tools.android.com/tech-docs/new-build-system/version-compatibility + // and https://issues.apache.org/jira/browse/CB-8143 + if (gradle.gradleVersion >= "2.1") { + dependencies { + classpath 'com.android.tools.build:gradle:0.14.0+' + } + } else { + dependencies { + classpath 'com.android.tools.build:gradle:0.12.0+' + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org