cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [1/2] android commit: gradle: Fix incorrect buildTools dependencies in framework's build.gradle
Date Tue, 20 Jan 2015 15:50:48 GMT
Repository: cordova-android
Updated Branches:
  refs/heads/3.7.x 26f0401fd -> 050dd088c
  refs/heads/master 623b394c8 -> 2964aea44


gradle: Fix incorrect buildTools dependencies in framework's build.gradle

(although it didn't seem to hurt anything?)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2964aea4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2964aea4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2964aea4

Branch: refs/heads/master
Commit: 2964aea44727626953c0304eedcef10e7416bf0b
Parents: 623b394
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Jan 20 10:49:19 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Jan 20 10:49:19 2015 -0500

----------------------------------------------------------------------
 framework/build.gradle | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2964aea4/framework/build.gradle
----------------------------------------------------------------------
diff --git a/framework/build.gradle b/framework/build.gradle
index cace204..2565633 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -23,23 +23,21 @@ buildscript {
         mavenCentral()
     }
 
-    dependencies {
-        // 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.2") {
-            dependencies {
-                classpath 'com.android.tools.build:gradle:1.0.0+'
-            }
-        } else 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+'
-            }
+    // 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.2") {
+        dependencies {
+            classpath 'com.android.tools.build:gradle:1.0.0+'
+        }
+    } else 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