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-amazon-fireos/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/304df341 Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/304df341 Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/304df341 Branch: refs/heads/master Commit: 304df34183ed8f2b2a1c7cc67cf932be23a5904e Parents: 3add113 Author: Andrew Grieve <[email protected]> Authored: Mon Sep 22 20:54:28 2014 -0400 Committer: Prabhjot Singh <[email protected]> Committed: Mon Oct 6 16:09:46 2014 +0530 ---------------------------------------------------------------------- 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-amazon-fireos/blob/304df341/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-amazon-fireos/blob/304df341/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 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
