From 5bf5687ccf6c61cecd7a39529ce09591e4aa2379 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Fri, 12 May 2023 16:28:05 -0600
Subject: [PATCH] build: update agp to 8.0.1

---
 app/build.gradle                              | 19 ++++++++++---------
 .../java/org/oxycblt/auxio/StubTest.kt        |  2 +-
 .../music/dialog/PlaylistDialogViewModel.kt   |  1 -
 build.gradle                                  |  2 +-
 gradle.properties                             |  5 ++++-
 media                                         |  2 +-
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a6a59f192..6586384d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,12 +30,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
         freeCompilerArgs += "-Xjvm-default=all"
     }
 
@@ -56,15 +56,16 @@ android {
             }
         }
     }
-
     packagingOptions {
-        exclude "DebugProbesKt.bin"
-        exclude "kotlin-tooling-metadata.json"
-        exclude "**/kotlin/**"
-        exclude "**/okhttp3/**"
-        exclude "META-INF/*.version"
+        jniLibs {
+            excludes += ['**/kotlin/**', '**/okhttp3/**']
+        }
+        resources {
+            excludes += ['DebugProbesKt.bin', 'kotlin-tooling-metadata.json', '**/kotlin/**', '**/okhttp3/**', 'META-INF/*.version']
+        }
     }
 
+
     buildFeatures {
         viewBinding true
     }
diff --git a/app/src/androidTest/java/org/oxycblt/auxio/StubTest.kt b/app/src/androidTest/java/org/oxycblt/auxio/StubTest.kt
index 32c443adb..a0ba54a3d 100644
--- a/app/src/androidTest/java/org/oxycblt/auxio/StubTest.kt
+++ b/app/src/androidTest/java/org/oxycblt/auxio/StubTest.kt
@@ -35,6 +35,6 @@ class StubTest {
     @Test
     fun useAppContext() {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("org.oxycblt.auxio", appContext.packageName)
+        assertEquals("org.oxycblt.auxio.debug", appContext.packageName)
     }
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/dialog/PlaylistDialogViewModel.kt b/app/src/main/java/org/oxycblt/auxio/music/dialog/PlaylistDialogViewModel.kt
index b0370c618..6f4813759 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/dialog/PlaylistDialogViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/dialog/PlaylistDialogViewModel.kt
@@ -28,7 +28,6 @@ import kotlinx.parcelize.Parcelize
 import org.oxycblt.auxio.music.Music
 import org.oxycblt.auxio.music.MusicRepository
 import org.oxycblt.auxio.music.Song
-import org.oxycblt.auxio.util.logD
 
 /**
  * A [ViewModel] managing the state of the playlist editing dialogs.
diff --git a/build.gradle b/build.gradle
index bd58d4d81..27c3ff77c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:6.18.0"
diff --git a/gradle.properties b/gradle.properties
index 855d32826..8e89fa623 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.enableR8.fullMode=true
\ No newline at end of file
+android.enableR8.fullMode=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/media b/media
index 5346fe2e5..4ab06ffd6 160000
--- a/media
+++ b/media
@@ -1 +1 @@
-Subproject commit 5346fe2e5c812756465e5cb255f388b0db5cf017
+Subproject commit 4ab06ffd6039c038f2995f1a06bafed28bdd9be4