From b71e61a221466fe9cbaaa031733f3ffff9209829 Mon Sep 17 00:00:00 2001 From: orionlee Date: Tue, 13 Mar 2018 09:51:50 -0700 Subject: [PATCH 01/13] 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 +- build.gradle | 10 +- core/build.gradle | 4 +- core/src/main/res/values/styles.xml | 404 ++++++++++++++-------------- 4 files changed, 219 insertions(+), 213 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ad388bd0257..0ad6a423dd1 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") } diff --git a/build.gradle b/build.gradle index 632c8e7bdc2..e15625f13ec 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,11 @@ buildscript { repositories { jcenter() mavenCentral() + google() } dependencies { - classpath "com.android.tools.build:gradle:2.3.3" - classpath "me.tatarka:gradle-retrolambda:3.7.0" - classpath "me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2" - classpath "com.github.triplet.gradle:play-publisher:1.1.4" + classpath "com.android.tools.build:gradle:3.0.1" + classpath "com.github.triplet.gradle:play-publisher:1.2.0" // Exclude the version that the android plugin depends on. configurations.classpath.exclude group: "com.android.tools.external.lombok" } @@ -18,6 +17,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } @@ -38,7 +38,7 @@ subprojects { project.ext { compileSdkVersion = 25 - buildToolsVersion = "25.0.3" + buildToolsVersion = "27.0.3" minSdkVersion = 14 targetSdkVersion = 25 diff --git a/core/build.gradle b/core/build.gradle index 3ef2898b83a..c2317e850f3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,4 @@ apply plugin: "com.android.library" -apply plugin: "me.tatarka.retrolambda" android { compileSdkVersion rootProject.ext.compileSdkVersion @@ -31,10 +30,13 @@ android { } publishNonDefault true + flavorDimensions "market" productFlavors { free { + dimension "market" } play { + dimension "market" } } diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index b9a9fb29328..13d956bab0a 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -11,57 +11,57 @@ @style/ProgressBarLight @style/Widget.AntennaPod.Button @style/AntennaPod.Dialog.Light - @color/grey600 - @drawable/ic_info_grey600_24dp - @drawable/ic_search_grey600_24dp - @drawable/ic_settings_input_antenna_grey600_24dp - @drawable/ic_file_download_grey600_24dp - @drawable/ic_fast_forward_grey600_24dp - @drawable/ic_pause_grey600_24dp - @drawable/ic_play_arrow_grey600_24dp - @drawable/ic_fast_rewind_grey600_24dp - @drawable/ic_delete_grey600_24dp - @drawable/ic_add_grey600_24dp - @drawable/ic_feed_grey600_24dp - @drawable/ic_web_grey600_24dp - @drawable/ic_done_grey600_24dp - @drawable/ic_cancel_grey600_24dp - @drawable/ic_expand_more_grey600_36dp - @drawable/ic_refresh_grey600_24dp - @drawable/navigation_up - @drawable/ic_share_grey600_24dp - @drawable/ic_list_grey600_24dp - @drawable/ic_hearing_grey600_18dp - @drawable/ic_remove_red_eye_grey600_18dp - @color/white - @color/overlay_light - @drawable/overlay_drawable - @drawable/ic_drag_vertical_grey600_48dp - @color/white - @color/white - @drawable/ic_new_releases_grey600_24dp - @drawable/ic_history_grey600_24dp - @drawable/ic_folder_grey600_24dp - @drawable/ic_play_arrow_grey600_36dp - @drawable/ic_pause_grey600_36dp - @drawable/ic_fast_forward_grey600_36dp - @drawable/ic_fast_rewind_grey600_36dp - @drawable/ic_skip_grey600_36dp - @drawable/ic_star_border_grey600_24dp - @drawable/ic_star_grey600_24dp - @drawable/ic_settings_grey600_24dp - @drawable/ic_lock_open_grey600_24dp - @drawable/ic_lock_closed_grey600_24dp - @drawable/ic_filter_grey600_24dp - @drawable/ic_sleep_grey600_24dp - @drawable/ic_sleep_off_grey600_24dp - @drawable/ic_check_box_grey600_24dp - @drawable/ic_check_box_outline_blank_grey600_24dp - @drawable/ic_indeterminate_check_box_grey600_24dp - @drawable/ic_sort_grey600_24dp - @drawable/ic_sd_storage_grey600_36dp - @drawable/ic_create_new_folder_grey600_24dp - @drawable/ic_cast_disconnect_grey600_36dp + @color/grey600 + @drawable/ic_info_grey600_24dp + @drawable/ic_search_grey600_24dp + @drawable/ic_settings_input_antenna_grey600_24dp + @drawable/ic_file_download_grey600_24dp + @drawable/ic_fast_forward_grey600_24dp + @drawable/ic_pause_grey600_24dp + @drawable/ic_play_arrow_grey600_24dp + @drawable/ic_fast_rewind_grey600_24dp + @drawable/ic_delete_grey600_24dp + @drawable/ic_add_grey600_24dp + @drawable/ic_feed_grey600_24dp + @drawable/ic_web_grey600_24dp + @drawable/ic_done_grey600_24dp + @drawable/ic_cancel_grey600_24dp + @drawable/ic_expand_more_grey600_36dp + @drawable/ic_refresh_grey600_24dp + @drawable/navigation_up + @drawable/ic_share_grey600_24dp + @drawable/ic_list_grey600_24dp + @drawable/ic_hearing_grey600_18dp + @drawable/ic_remove_red_eye_grey600_18dp + @color/white + @color/overlay_light + @drawable/overlay_drawable + @drawable/ic_drag_vertical_grey600_48dp + @color/white + @color/white + @drawable/ic_new_releases_grey600_24dp + @drawable/ic_history_grey600_24dp + @drawable/ic_folder_grey600_24dp + @drawable/ic_play_arrow_grey600_36dp + @drawable/ic_pause_grey600_36dp + @drawable/ic_fast_forward_grey600_36dp + @drawable/ic_fast_rewind_grey600_36dp + @drawable/ic_skip_grey600_36dp + @drawable/ic_star_border_grey600_24dp + @drawable/ic_star_grey600_24dp + @drawable/ic_settings_grey600_24dp + @drawable/ic_lock_open_grey600_24dp + @drawable/ic_lock_closed_grey600_24dp + @drawable/ic_filter_grey600_24dp + @drawable/ic_sleep_grey600_24dp + @drawable/ic_sleep_off_grey600_24dp + @drawable/ic_check_box_grey600_24dp + @drawable/ic_check_box_outline_blank_grey600_24dp + @drawable/ic_indeterminate_check_box_grey600_24dp + @drawable/ic_sort_grey600_24dp + @drawable/ic_sd_storage_grey600_36dp + @drawable/ic_create_new_folder_grey600_24dp + @drawable/ic_cast_disconnect_grey600_36dp