cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject android commit: CB-8143: Use the correct Android Gradle plugin for the installed Gradle version
Date Wed, 10 Dec 2014 15:13:15 GMT
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 <iclelland@chromium.org>
Authored: Wed Dec 10 10:07:05 2014 -0500
Committer: Ian Clelland <iclelland@chromium.org>
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


Mime
View raw message