cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject [04/12] cordova-amazon-fireos git commit: CB-8143: Use the correct Android Gradle plugin for the installed Gradle version
Date Mon, 22 Dec 2014 15:53:01 GMT
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 <iclelland@chromium.org>
Authored: Wed Dec 10 10:07:05 2014 -0500
Committer: Ajitha <ajithas@amazon.com>
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


Mime
View raw message