You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/12/22 17:26:12 UTC
[1/3] android commit: CB-8143 Use gradle plugin 1.0.0 for Android
Studio 1.0.0
Repository: cordova-android
Updated Branches:
refs/heads/4.0.x 59d23e05b -> 20cd4f806
refs/heads/master 731a36d3a -> b92303b1c
CB-8143 Use gradle plugin 1.0.0 for Android Studio 1.0.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b92303b1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b92303b1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b92303b1
Branch: refs/heads/4.0.x
Commit: b92303b1c9f126511b50bb9f8e40f4b8d5bf0a66
Parents: 731a36d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Dec 22 11:19:21 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Dec 22 11:19:21 2014 -0500
----------------------------------------------------------------------
bin/templates/project/build.gradle | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b92303b1/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index a2ebaf5..a8be9c4 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -35,7 +35,11 @@ buildscript {
// 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") {
+ 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+'
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] android commit: Merge branch 'master' into 4.0.x (gradle
version for Android Studio)
Posted by ag...@apache.org.
Merge branch 'master' into 4.0.x (gradle version for Android Studio)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/20cd4f80
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/20cd4f80
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/20cd4f80
Branch: refs/heads/4.0.x
Commit: 20cd4f806ae80567d55ccfc630ae0d5b439ecefa
Parents: 59d23e0 b92303b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Dec 22 11:25:59 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Dec 22 11:25:59 2014 -0500
----------------------------------------------------------------------
bin/templates/project/build.gradle | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/20cd4f80/bin/templates/project/build.gradle
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] android commit: CB-8143 Use gradle plugin 1.0.0 for Android
Studio 1.0.0
Posted by ag...@apache.org.
CB-8143 Use gradle plugin 1.0.0 for Android Studio 1.0.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b92303b1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b92303b1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b92303b1
Branch: refs/heads/master
Commit: b92303b1c9f126511b50bb9f8e40f4b8d5bf0a66
Parents: 731a36d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Dec 22 11:19:21 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Dec 22 11:19:21 2014 -0500
----------------------------------------------------------------------
bin/templates/project/build.gradle | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b92303b1/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index a2ebaf5..a8be9c4 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -35,7 +35,11 @@ buildscript {
// 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") {
+ 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+'
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org