From 8a8f051a4c94db375957ce5027213a14cf7f35c1 Mon Sep 17 00:00:00 2001
From: vfsfitvnm <vfsfitvnm@protonmail.com>
Date: Mon, 11 Jul 2022 11:58:16 +0200
Subject: [PATCH] Fix or suppress deprecations

---
 app/build.gradle.kts                                           | 2 ++
 app/src/main/AndroidManifest.xml                               | 3 +--
 .../main/kotlin/it/vfsfitvnm/vimusic/ui/components/Pager.kt    | 2 +-
 .../main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt  | 1 +
 settings.gradle.kts                                            | 1 -
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f8765b2..15377d4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,6 +26,8 @@ android {
         }
     }
 
+    namespace = "it.vfsfitvnm.vimusic"
+
     buildTypes {
         debug {
             applicationIdSuffix = ".debug"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e75d75e..b672903 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="it.vfsfitvnm.vimusic">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/Pager.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/Pager.kt
index c8e2d42..282f534 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/Pager.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/Pager.kt
@@ -265,7 +265,7 @@ fun <T : Enum<T>> EnumPager(
     content: @Composable (item: T) -> Unit
 ) {
     val items = remember {
-        value.declaringClass.enumConstants!!
+        value.declaringJavaClass.enumConstants!!
     }
 
     Pager(
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt
index 4f81201..ee90103 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt
@@ -26,6 +26,7 @@ data class Typography(
 
 val LocalTypography = staticCompositionLocalOf<Typography> { TODO() }
 
+@Suppress("DEPRECATION")
 @OptIn(ExperimentalTextApi::class)
 @Composable
 fun rememberTypography(color: Color): Typography {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 09a30d2..4673dc6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,3 @@
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {