From d5bb78cec13e4ea947882ed94caf16e826f4c6c4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <project37671564_bot@noreply.gitlab.com>
Date: Sat, 24 Sep 2022 08:08:10 +0000
Subject: [PATCH] Update dependency androidx.core:core-ktx to v1.9.0

---
 core/domain/build.gradle                              |  4 ++++
 core/domain/src/main/AndroidManifest.xml              |  3 +--
 gradle/libs.versions.toml                             |  4 ++--
 gradle/versions.gradle                                |  2 +-
 ultrasonic/build.gradle                               |  1 +
 ultrasonic/src/main/AndroidManifest.xml               |  1 -
 .../ultrasonic/service/MediaPlayerLifecycleSupport.kt | 11 ++++++++---
 .../src/main/kotlin/org/moire/ultrasonic/util/Util.kt |  1 +
 8 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/domain/build.gradle b/core/domain/build.gradle
index 3ed1e681..b462ae9c 100644
--- a/core/domain/build.gradle
+++ b/core/domain/build.gradle
@@ -6,3 +6,7 @@ dependencies {
     implementation libs.roomKtx
     kapt libs.room
 }
+
+android {
+    namespace 'org.moire.ultrasonic.subsonic.domain'
+}
diff --git a/core/domain/src/main/AndroidManifest.xml b/core/domain/src/main/AndroidManifest.xml
index 1d8d8efa..74b7379f 100644
--- a/core/domain/src/main/AndroidManifest.xml
+++ b/core/domain/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.moire.ultrasonic.subsonic.domain">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 01fe4f84..1fce19c6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,8 +3,8 @@
 gradle                 = "7.5.1"
 
 navigation             = "2.5.1"
-gradlePlugin           = "7.2.2"
-androidxcore           = "1.8.0"
+gradlePlugin           = "7.3.0"
+androidxcore           = "1.9.0"
 ktlint                 = "0.43.2"
 ktlintGradle           = "10.3.0"
 detekt                 = "1.19.0"
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index f82eeea8..4e7d1ef2 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -1,5 +1,5 @@
 ext.versions = [
         minSdk               : 21,
         targetSdk            : 33,
-        compileSdk           : 31,
+        compileSdk           : 33,
 ]
\ No newline at end of file
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index c2da6b7c..091a27d1 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -78,6 +78,7 @@ android {
         warning 'ImpliedQuantity'
         disable 'ObsoleteLintCustomCheck'
     }
+    namespace 'org.moire.ultrasonic'
 
 }
 
diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml
index e38effae..cad7cdc9 100644
--- a/ultrasonic/src/main/AndroidManifest.xml
+++ b/ultrasonic/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.moire.ultrasonic"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt
index f2a0c79a..0c330816 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt
@@ -12,9 +12,9 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.media.AudioManager
+import android.os.Build
 import android.view.KeyEvent
 import io.reactivex.rxjava3.disposables.CompositeDisposable
-import org.koin.android.ext.android.inject
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.moire.ultrasonic.app.UApp
@@ -110,7 +110,12 @@ class MediaPlayerLifecycleSupport : KoinComponent {
 
         if (intentAction == Constants.CMD_PROCESS_KEYCODE) {
             if (intent.extras != null) {
-                val event = intent.extras!![Intent.EXTRA_KEY_EVENT] as KeyEvent?
+                val event = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    intent.extras!!.getParcelable(Intent.EXTRA_KEY_EVENT, KeyEvent::class.java)
+                } else {
+                    @Suppress("DEPRECATION")
+                    intent.extras!![Intent.EXTRA_KEY_EVENT] as KeyEvent?
+                }
                 event.ifNotNull { handleKeyEvent(it) }
             }
         } else {
@@ -130,7 +135,7 @@ class MediaPlayerLifecycleSupport : KoinComponent {
             override fun onReceive(context: Context, intent: Intent) {
                 val extras = intent.extras ?: return
 
-                Timber.i("Headset event for: %s", extras["name"])
+                Timber.i("Headset event for: %s", extras.getString("name"))
 
                 val state = extras.getInt("state")
 
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
index 47c3853e..41a5c6e2 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt
@@ -509,6 +509,7 @@ object Util {
     }
 
     @JvmStatic
+    @Suppress("DEPRECATION")
     fun getVersionName(context: Context): String? {
         var versionName: String? = null
         val pm = context.packageManager