cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [2/7] android commit: CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)
Date Tue, 23 Sep 2014 02:35:48 GMT
CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)


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

Branch: refs/heads/master
Commit: 2b128b85f7a29c6e7c9b0232cc9a04a72f36cd01
Parents: 879da03
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Mon Sep 22 20:54:28 2014 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Mon Sep 22 20:54:28 2014 -0400

----------------------------------------------------------------------
 bin/templates/project/build.gradle | 21 ++++++++++++---------
 framework/build.gradle             |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b128b85/bin/templates/project/build.gradle
----------------------------------------------------------------------
diff --git a/bin/templates/project/build.gradle b/bin/templates/project/build.gradle
index 6de8c54..41984fa 100644
--- a/bin/templates/project/build.gradle
+++ b/bin/templates/project/build.gradle
@@ -34,15 +34,12 @@ buildscript {
     }
 }
 
-ext.multiarch=false
-
-dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
-    for (subproject in getProjectList()) {
-        compile project(subproject)
-    }
+task wrapper(type: Wrapper) {
+    gradleVersion = '1.12'
 }
 
+ext.multiarch=false
+
 android {
     sourceSets {
         main {
@@ -112,10 +109,16 @@ android {
     }
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '1.12'
+dependencies {
+    compile fileTree(dir: 'libs', include: '*.jar')
+    // https://code.google.com/p/android/issues/detail?id=52962
+    for (subproject in getProjectList()) {
+        releaseCompile project(path: subproject, configuration: 'release')
+        debugCompile project(path: subproject, configuration: 'debug')
+    }
 }
 
+
 def promptForPassword(msg) {
     if (System.console() == null) {
         def ret = null

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2b128b85/framework/build.gradle
----------------------------------------------------------------------
diff --git a/framework/build.gradle b/framework/build.gradle
index 6ca284d..85295f8 100644
--- a/framework/build.gradle
+++ b/framework/build.gradle
@@ -39,6 +39,7 @@ apply plugin: 'android-library'
 android {
     compileSdkVersion cordova.cordovaSdkVersion
     buildToolsVersion cordova.cordovaBuildToolsVersion
+    publishNonDefault true
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7


Mime
View raw message