You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/09/26 22:28:32 UTC
[1/3] android commit: CB-11907: Bumping Gradle to work with Android
Studio 2.2 and the Android Gradle Plugin
Repository: cordova-android
Updated Branches:
refs/heads/master a4f6c8bf7 -> 9cf38f870
CB-11907: Bumping Gradle to work with Android Studio 2.2 and the Android Gradle Plugin
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7de4803e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7de4803e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7de4803e
Branch: refs/heads/master
Commit: 7de4803e21f852d8fd479ad58bc7cae2e314689c
Parents: 9586a7d
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Sep 26 15:04:41 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Sep 26 15:06:44 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/lib/builders/GradleBuilder.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7de4803e/bin/templates/cordova/lib/builders/GradleBuilder.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/builders/GradleBuilder.js b/bin/templates/cordova/lib/builders/GradleBuilder.js
index 46b890e..8fb5c6b 100644
--- a/bin/templates/cordova/lib/builders/GradleBuilder.js
+++ b/bin/templates/cordova/lib/builders/GradleBuilder.js
@@ -163,7 +163,7 @@ GradleBuilder.prototype.prepEnv = function(opts) {
// For some reason, using ^ and $ don't work. This does the job, though.
var distributionUrlRegex = /distributionUrl.*zip/;
/*jshint -W069 */
- var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'http\\://services.gradle.org/distributions/gradle-2.13-all.zip';
+ var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'http\\://services.gradle.org/distributions/gradle-2.14.1-all.zip';
/*jshint +W069 */
var gradleWrapperPropertiesPath = path.join(self.root, 'gradle', 'wrapper', 'gradle-wrapper.properties');
shell.chmod('u+w', gradleWrapperPropertiesPath);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] android commit: CB-11907: Bumping Android Gradle Plugin version
to 2.2 so this works with Android Studio
Posted by bo...@apache.org.
CB-11907: Bumping Android Gradle Plugin version to 2.2 so this works with 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/9586a7dd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/9586a7dd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/9586a7dd
Branch: refs/heads/master
Commit: 9586a7ddcd46b4d7bad432cf407f5c58f737d942
Parents: a4f6c8b
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Sep 26 13:58:58 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Sep 26 15:06:44 2016 -0700
----------------------------------------------------------------------
bin/templates/project/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9586a7dd/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 0ec49a9..85a6272 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -30,7 +30,7 @@ buildscript {
// http://tools.android.com/tech-docs/new-build-system/version-compatibility
// and https://issues.apache.org/jira/browse/CB-8143
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.0'
+ classpath 'com.android.tools.build:gradle:2.2.0'
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] android commit: CB-11907: Bumping Gradle to work with Android
Studio 2.2 and the Gradle Plugin, I should have done this last commit
Posted by bo...@apache.org.
CB-11907: Bumping Gradle to work with Android Studio 2.2 and the Gradle Plugin, I should have done this last commit
This closes #336
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/9cf38f87
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/9cf38f87
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/9cf38f87
Branch: refs/heads/master
Commit: 9cf38f8705654e28ae2e2fa6d3044295afc6c185
Parents: 7de4803
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Sep 26 15:05:23 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Sep 26 15:28:02 2016 -0700
----------------------------------------------------------------------
bin/templates/project/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9cf38f87/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 85a6272..d40cfda 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -43,7 +43,7 @@ allprojects {
}
task wrapper(type: Wrapper) {
- gradleVersion = '2.13'
+ gradleVersion = '2.14.1'
}
// Configuration properties. Set these via environment variables, build-extras.gradle, or gradle.properties.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org