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 646231054A for ; Wed, 10 Dec 2014 15:13:16 +0000 (UTC) Received: (qmail 95318 invoked by uid 500); 10 Dec 2014 15:13:16 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 95291 invoked by uid 500); 10 Dec 2014 15:13:16 -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 95279 invoked by uid 99); 10 Dec 2014 15:13:16 -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, 10 Dec 2014 15:13:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CB65AA23AB7; Wed, 10 Dec 2014 15:13:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ian@apache.org To: commits@cordova.apache.org Message-Id: <701d3f0ee78a4877af207ea88ac98169@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: android commit: CB-8143: Use the correct Android Gradle plugin for the installed Gradle version Date: Wed, 10 Dec 2014 15:13:15 +0000 (UTC) Repository: cordova-android Updated Branches: refs/heads/master ffd14fe7d -> f953e6adb CB-8143: Use the correct Android Gradle plugin for the installed Gradle version Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f953e6ad Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f953e6ad Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f953e6ad Branch: refs/heads/master Commit: f953e6adb8478edee1d68419cba35d35a400b641 Parents: ffd14fe Author: Ian Clelland Authored: Wed Dec 10 10:07:05 2014 -0500 Committer: Ian Clelland Committed: Wed Dec 10 10:07:05 2014 -0500 ---------------------------------------------------------------------- bin/templates/project/build.gradle | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f953e6ad/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