From 01446326f54a3158beb4bcb6d8b996fb805f1c25 Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Sat, 1 Aug 2015 18:28:33 +0200 Subject: [PATCH 1/2] Cleanup build.gradle Change-Id: Idc2fe14692a39ec43f09ed8ee3f3e9c6e9107cdd --- build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.gradle b/build.gradle index b3444af82..17d8adef6 100644 --- a/build.gradle +++ b/build.gradle @@ -22,12 +22,6 @@ apply plugin: 'com.android.library' android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - packagingOptions { - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE.txt' - } sourceSets { main { manifest.srcFile 'AndroidManifest.xml' From f4362c1573ec410b7549eaee28847d34a4701c73 Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Wed, 12 Aug 2015 15:16:11 +0200 Subject: [PATCH 2/2] refactor gradle files Change-Id: I186215509442dcc9973ef13fe543c3c2af2425a9 --- build.gradle | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 17d8adef6..6223673a3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,3 @@ -apply plugin: 'com.android.library' /******************************************************************************* * Mirakel is an Android App for managing your ToDo-Lists * @@ -18,9 +17,6 @@ apply plugin: 'com.android.library' * along with this program. If not, see . ******************************************************************************/ -//apply plugin: 'hugo' - - android { sourceSets { main { @@ -36,7 +32,8 @@ android { } } dependencies { - compile project(':colorpicker') - compile project(':helper') + debugCompile project(path: ':helper',configuration: 'debug') + releaseCompile project(path: ':helper',configuration: 'release') + debugCompile project(path: ':colorpicker',configuration: 'debug') + releaseCompile project(path: ':colorpicker',configuration: 'release') } -