From 5f70ce887096eaf635783c42c2024d1344030733 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Thu, 1 Jun 2023 10:49:22 -0600 Subject: [PATCH] build: drop api 21-23 support Drop support for Lollipop and Marshmallow. I legit cannot build for them anymore. There's some insane dependency tangle between Kapt and Room that makes it impossible to use anything BUT Java 17 (maybe Java 11). If I use Java 17 or Java 11, suddenly the whole app crashes since Lollipop and Marshmallow only support some weird Java 8/11 chimera abomination. This issue has persisted probably since the move to Java 11, making it basically unusable anyway, so at this point just cut the charade and officially drop support. --- CHANGELOG.md | 3 +++ README.md | 2 +- app/build.gradle | 2 +- .../main/java/org/oxycblt/auxio/util/ContextUtil.kt | 4 ++-- app/src/main/res/drawable-v23/ui_item_ripple.xml | 5 ----- app/src/main/res/drawable/ui_item_bg.xml | 1 + app/src/main/res/values-v23/styles_core.xml | 13 ------------- app/src/main/res/values/styles_core.xml | 6 ++++++ 8 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 app/src/main/res/drawable-v23/ui_item_ripple.xml delete mode 100644 app/src/main/res/values-v23/styles_core.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index f363b1ae7..06e0002f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,9 @@ within it - Fixed blurry playing indicator in album/artist/genre/playlist items - Fixed incorrect songs being displayed when adding albums to the end of the queue +#### What's Changed +- Android Lollipop and Marshmallow support have been dropped + ## 3.1.0 #### What's New diff --git a/README.md b/README.md index fb8ede52d..8dd46d94c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ - Minimum SDK Version + Minimum SDK Version

Changelog | Wiki

diff --git a/app/build.gradle b/app/build.gradle index 16c0c2cca..965b4244b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { versionName "3.1.0" versionCode 30 - minSdk 21 + minSdk 24 targetSdk 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt index d4c058077..c8bcd6a9c 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/ContextUtil.kt @@ -184,7 +184,7 @@ fun Context.newMainPendingIntent(): PendingIntent = this, IntegerTable.REQUEST_CODE, Intent(this, MainActivity::class.java), - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0) + PendingIntent.FLAG_IMMUTABLE) /** * Create a [PendingIntent] that will broadcast the specified command when launched. @@ -196,4 +196,4 @@ fun Context.newBroadcastPendingIntent(action: String): PendingIntent = this, IntegerTable.REQUEST_CODE, Intent(action).setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY), - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0) + PendingIntent.FLAG_IMMUTABLE) diff --git a/app/src/main/res/drawable-v23/ui_item_ripple.xml b/app/src/main/res/drawable-v23/ui_item_ripple.xml deleted file mode 100644 index 8f0d43cfb..000000000 --- a/app/src/main/res/drawable-v23/ui_item_ripple.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ui_item_bg.xml b/app/src/main/res/drawable/ui_item_bg.xml index fb0a9dec3..a8a60879f 100644 --- a/app/src/main/res/drawable/ui_item_bg.xml +++ b/app/src/main/res/drawable/ui_item_bg.xml @@ -1,5 +1,6 @@ + \ No newline at end of file diff --git a/app/src/main/res/values-v23/styles_core.xml b/app/src/main/res/values-v23/styles_core.xml deleted file mode 100644 index c3bd17685..000000000 --- a/app/src/main/res/values-v23/styles_core.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml index bbe18c90c..446c3064f 100644 --- a/app/src/main/res/values/styles_core.xml +++ b/app/src/main/res/values/styles_core.xml @@ -50,9 +50,15 @@ false true + + @color/sel_compat_ripple ?attr/colorOnSurfaceVariant ?attr/colorPrimary + + @color/overlay_text_highlight + @color/overlay_text_highlight_inverse + @style/PreferenceTheme.Auxio @style/Preference.Auxio @style/Preference.Auxio.PreferenceCategory