diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 93e6e10..00d25f9 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,7 +13,6 @@
-
diff --git a/app/build.gradle b/app/build.gradle
index 15259f3..fddecc0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,13 +46,14 @@ android {
excludes += '/META-INF/{AL2.0,LGPL2.1}'
}
}
+ namespace 'net.blumia.pcmdroid'
}
dependencies {
- implementation 'androidx.core:core-ktx:1.7.0'
- implementation 'androidx.appcompat:appcompat:1.4.1'
- implementation 'com.google.android.material:material:1.5.0'
+ implementation 'androidx.core:core-ktx:1.8.0'
+ implementation 'androidx.appcompat:appcompat:1.4.2'
+ implementation 'com.google.android.material:material:1.6.1'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
@@ -60,7 +61,7 @@ dependencies {
implementation "androidx.compose.material:material-icons-extended:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
- def nav_compose_version = '2.4.1'
+ def nav_compose_version = '2.4.2'
implementation "androidx.navigation:navigation-compose:$nav_compose_version"
def lifecycle_version = '2.4.1'
@@ -78,7 +79,7 @@ dependencies {
implementation "com.squareup.okhttp3:okhttp:4.9.0"
- def media3_version = '1.0.0-alpha03'
+ def media3_version = '1.0.0-beta01'
implementation "androidx.media3:media3-ui:$media3_version"
implementation "androidx.media3:media3-exoplayer:$media3_version"
implementation "androidx.media3:media3-session:$media3_version"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5914718..49f428f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+
diff --git a/app/src/main/java/net/blumia/pcmdroid/service/PlaybackService.kt b/app/src/main/java/net/blumia/pcmdroid/service/PlaybackService.kt
index 810821e..8370092 100644
--- a/app/src/main/java/net/blumia/pcmdroid/service/PlaybackService.kt
+++ b/app/src/main/java/net/blumia/pcmdroid/service/PlaybackService.kt
@@ -26,7 +26,7 @@ class PlaybackService : MediaLibraryService() {
private val librarySessionCallback = CustomMediaLibrarySessionCallback()
private inner class CustomMediaLibrarySessionCallback
- : MediaLibrarySession.MediaLibrarySessionCallback
+ : MediaLibrarySession.Callback
{
@androidx.annotation.OptIn(UnstableApi::class)
override fun onGetLibraryRoot(
@@ -59,21 +59,6 @@ class PlaybackService : MediaLibraryService() {
}
}
- class CustomMediaItemFiller : MediaSession.MediaItemFiller {
- override fun fillInLocalConfiguration(
- session: MediaSession,
- controller: MediaSession.ControllerInfo,
- mediaItem: MediaItem
- ): MediaItem {
- // Return the media item that it will be played
- return MediaItem.Builder()
- // Use the metadata values to fill our media item
- .setUri(mediaItem.mediaMetadata.mediaUri)
- .setMediaMetadata(mediaItem.mediaMetadata)
- .build()
- }
- }
-
override fun onGetSession(controllerInfo: MediaSession.ControllerInfo): MediaLibrarySession {
return mediaLibrarySession
}
@@ -107,7 +92,6 @@ class PlaybackService : MediaLibraryService() {
mediaLibrarySession =
MediaLibrarySession.Builder(this, player, librarySessionCallback)
- .setMediaItemFiller(CustomMediaItemFiller())
.setSessionActivity(pendingIntent!!)
.build()
}
diff --git a/build.gradle b/build.gradle
index 2cafdd0..ae1935f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
}
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '7.1.2' apply false
- id 'com.android.library' version '7.1.2' apply false
+ id 'com.android.application' version '7.2.1' apply false
+ id 'com.android.library' version '7.2.1' apply false
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5983eae..a6d17a8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Nov 05 23:12:10 CST 2021
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME