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/06/09 17:50:08 UTC

[1/2] android commit: CB-11383: Update to gradle for using jcenter and correct Application plugin

Repository: cordova-android
Updated Branches:
  refs/heads/master 81d621966 -> 04a3c9d9e


CB-11383: Update to gradle for using jcenter and correct Application 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/db4d1f57
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/db4d1f57
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/db4d1f57

Branch: refs/heads/master
Commit: db4d1f57682224476e270d42f654321b82990dd0
Parents: 81d6219
Author: Joe Bowser <bo...@apache.org>
Authored: Mon Jun 6 11:21:30 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Jun 6 11:21:30 2016 -0700

----------------------------------------------------------------------
 bin/templates/project/build.gradle | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/db4d1f57/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 3448b50..8ac2473 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -17,13 +17,11 @@
        under the License.
 */
 
-// GENERATED FILE! DO NOT EDIT!
-
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     // Switch the Android Gradle plugin version requirement depending on the
@@ -33,11 +31,13 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.0'
     }
-   }
+}
 
 // Allow plugins to declare Maven dependencies via build-extras.gradle.
-repositories {
-    mavenCentral()
+allprojects {
+    repositories {
+        jcenter()
+    }
 }
 
 task wrapper(type: Wrapper) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/2] android commit: Adding mavenCentral just in case

Posted by bo...@apache.org.
Adding mavenCentral just in case

This closes #309


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

Branch: refs/heads/master
Commit: 04a3c9d9eef401e0035084bed4d65a15dc0bbf5d
Parents: db4d1f5
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Jun 8 10:10:24 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Jun 9 10:50:00 2016 -0700

----------------------------------------------------------------------
 bin/templates/project/build.gradle | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/04a3c9d9/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 8ac2473..0aad300 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -21,6 +21,7 @@ apply plugin: 'com.android.application'
 
 buildscript {
     repositories {
+        mavenCentral()
         jcenter()
     }
 
@@ -36,6 +37,7 @@ buildscript {
 // Allow plugins to declare Maven dependencies via build-extras.gradle.
 allprojects {
     repositories {
+        mavenCentral();
         jcenter()
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org