⬆️ Update android.plugin to v8 (major) (#146)

* ⬆️ Update android.plugin to v8 * 🐛 Fix resource references * 🔥 Remove BuildConfig from API AGP 8+ doesn't generate the BuildConfig class by default anymore. --------- Co-authored-by: Maxr1998 <[email protected]>
Maxr1998 · Sep 5, 2023 · 7b11fe0 · 7b11fe0
1 parent 2c6fb14
commit 7b11fe0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 # Plugins
-android-plugin = "7.4.2"
+android-plugin = "8.1.1"
 kotlin = "1.8.22"
 binarycompatibilityvalidator = "0.13.2"
 detekt = "1.21.0"

diff --git a/library/api/library.api b/library/api/library.api
@@ -28,13 +28,6 @@ public abstract class de/Maxr1998/modernpreferences/AbstractPreference {
 	public final fun setVisible (Z)V
 }
 
-public final class de/Maxr1998/modernpreferences/BuildConfig {
-	public static final field BUILD_TYPE Ljava/lang/String;
-	public static final field DEBUG Z
-	public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
-	public fun <init> ()V
-}
-
 public class de/Maxr1998/modernpreferences/Preference : de/Maxr1998/modernpreferences/AbstractPreference {
 	public fun <init> (Ljava/lang/String;)V
 	public fun bindViews (Lde/Maxr1998/modernpreferences/PreferencesAdapter$ViewHolder;)V

diff --git a/library/src/main/java/de/Maxr1998/modernpreferences/PreferencesAdapter.kt b/library/src/main/java/de/Maxr1998/modernpreferences/PreferencesAdapter.kt
@@ -263,7 +263,7 @@ class PreferencesAdapter @VisibleForTesting constructor(
 
         init {
             // Apply accent text color via theme attribute from library or fallback to AppCompat
-            val attrs = intArrayOf(R.attr.mapAccentTextColor, R.attr.colorAccent)
+            val attrs = intArrayOf(R.attr.mapAccentTextColor, androidx.appcompat.R.attr.colorAccent)
             accentTextColor = itemView.context.theme.obtainStyledAttributes(attrs).use { array ->
                 // Return first resolved attribute or null
                 if (array.indexCount > 0) array.getColorStateList(array.getIndex(0)) else null

diff --git a/library/src/main/java/de/Maxr1998/modernpreferences/preferences/choice/SelectionAdapter.kt b/library/src/main/java/de/Maxr1998/modernpreferences/preferences/choice/SelectionAdapter.kt
@@ -79,7 +79,7 @@ internal class SelectionAdapter(
 
         init {
             // Apply accent text color via theme attribute from library or fallback to AppCompat
-            val attrs = intArrayOf(R.attr.mapAccentTextColor, R.attr.colorAccent)
+            val attrs = intArrayOf(R.attr.mapAccentTextColor, androidx.appcompat.R.attr.colorAccent)
             accentTextColor = itemView.context.theme.obtainStyledAttributes(attrs).use { array ->
                 // Return first resolved attribute or null
                 if (array.indexCount > 0) array.getColorStateList(array.getIndex(0)) else null

diff --git a/library/src/main/java/de/Maxr1998/modernpreferences/views/ModernSeekBar.kt b/library/src/main/java/de/Maxr1998/modernpreferences/views/ModernSeekBar.kt
@@ -15,7 +15,7 @@ class ModernSeekBar(
     attrs: AttributeSet?,
     defStyleAttr: Int,
 ) : AppCompatSeekBar(context, attrs, defStyleAttr) {
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, R.attr.seekBarStyle)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, androidx.appcompat.R.attr.seekBarStyle)
     constructor(context: Context) : this(context, null)
 
     private var tickMarkDrawable: Drawable? = null