From b71e61a221466fe9cbaaa031733f3ffff9209829 Mon Sep 17 00:00:00 2001 From: orionlee Date: Tue, 13 Mar 2018 09:51:50 -0700 Subject: Upgrade to Android Gradle Plugin v3.0.1 - bare minimal to get it built, ignoring depercation warnings Details: - upgraded buildtools to the latest (minimum 26.0.2 required) - retired retrolambda - added flavorDimensions (v3 requirement) - Migrate dependency configurations for local modules (:core) - Declaration of resources update in styles.xml (AAPT2 requirement) - upgraded plugin github play-publisher to v1.2.0 --- app/build.gradle | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index ad388bd02..0ad6a423d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,6 @@ import org.apache.tools.ant.filters.ReplaceTokens apply plugin: "com.android.application" -apply plugin: "me.tatarka.retrolambda" apply plugin: 'com.github.triplet.play' apply plugin: 'com.getkeepsafe.dexcount' @@ -113,10 +112,13 @@ android { additionalParameters "--no-version-vectors" } + flavorDimensions "market" productFlavors { free { + dimension "market" } play { + dimension "market" } } @@ -133,12 +135,14 @@ configurations { } dependencies { - freeDebugCompile project(path: ":core", configuration: "freeDebug") - freeReleaseCompile project(path: ":core", configuration: "freeRelease") + ///freeDebugCompile project(path: ":core", configuration: "freeDebug") + ///freeReleaseCompile project(path: ":core", configuration: "freeRelease") + freeCompile project(":core") // free build hack: skip some dependencies if (!doFreeBuild()) { - playDebugCompile project(path: ":core", configuration: "playDebug") - playReleaseCompile project(path: ":core", configuration: "playRelease") + ///playDebugCompile project(path: ":core", configuration: "playDebug") + ///playReleaseCompile project(path: ":core", configuration: "playRelease") + playCompile project(":core") } else { System.out.println("app: free build hack, skipping some dependencies") } -- cgit v1.2.3