Skip to content

Commit 81821f2

Browse files
authored
Migrate from androidx-mediarouter-compose to MediaMaestro (#1040)
1 parent 402a0b4 commit 81821f2

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ androidx-core = "1.16.0"
77
androidx-datastore = "1.1.6"
88
androidx-lifecycle = "2.9.0"
99
androidx-media3 = "1.7.1"
10-
androidx-mediarouter-compose = "0.8.0"
1110
androidx-navigation = "2.9.0"
1211
androidx-paging = "3.3.6"
1312
androidx-test-core = "1.6.1"
@@ -28,6 +27,7 @@ kotlinx-coroutines = "1.10.2"
2827
kotlinx-datetime = "0.6.2"
2928
kotlinx-kover = "0.9.1"
3029
kotlinx-serialization = "1.8.1"
30+
media-maestro = "0.10.0"
3131
mockk = "1.14.2"
3232
okhttp = "4.12.0"
3333
okio = "3.11.0"
@@ -52,7 +52,6 @@ androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime",
5252
androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
5353
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
5454
androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
55-
androidx-mediarouter-compose = { module = "ch.srgssr.androidx.mediarouter:mediarouter-compose", version.ref = "androidx-mediarouter-compose" }
5655
androidx-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "androidx-navigation" }
5756
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidx-navigation" }
5857
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
@@ -78,6 +77,7 @@ kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.
7877
kotlinx-kover-gradle = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kotlinx-kover" }
7978
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
8079
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
80+
media-maestro = { module = "ch.srgssr.media.maestro:media-maestro", version.ref = "media-maestro" }
8181
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
8282
robolectric-annotations = { module = "org.robolectric:annotations", version.ref = "robolectric" }
8383
robolectric-shadows-framework = { module = "org.robolectric:shadows-framework", version.ref = "robolectric" }

pillarbox-demo/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ dependencies {
7575
implementation(libs.androidx.media3.session)
7676
implementation(libs.androidx.media3.ui)
7777
implementation(libs.androidx.media3.ui.compose)
78-
implementation(libs.androidx.mediarouter.compose)
7978
implementation(libs.androidx.navigation.common)
8079
implementation(libs.androidx.navigation.compose)
8180
implementation(libs.androidx.navigation.runtime)
@@ -91,6 +90,7 @@ dependencies {
9190
implementation(libs.kotlin.stdlib)
9291
implementation(libs.kotlinx.coroutines.core)
9392
implementation(libs.kotlinx.datetime)
93+
implementation(libs.media.maestro)
9494
implementation(libs.okhttp)
9595
implementation(libs.srg.data)
9696
implementation(libs.srg.dataprovider.retrofit)

pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/integrations/cast/CastShowcase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
2323
import androidx.media3.ui.PlayerView
2424
import androidx.mediarouter.media.MediaControlIntent
2525
import androidx.mediarouter.media.MediaRouteSelector
26-
import ch.srgssr.androidx.mediarouter.compose.MediaRouteButton
26+
import ch.srgssr.media.maestro.MediaRouteButton
2727
import ch.srgssr.pillarbox.cast.PillarboxCastPlayer
2828
import ch.srgssr.pillarbox.demo.R
2929
import ch.srgssr.pillarbox.demo.shared.data.samples.SamplesGoogle

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ dependencyResolutionManagement {
4747
includeGroup("ch.srg.data.provider")
4848
}
4949
}
50-
maven("https://maven.pkg.github.com/SRGSSR/androidx-mediarouter-compose") {
50+
maven("https://maven.pkg.github.com/SRGSSR/MediaMaestro") {
5151
credentials {
5252
username = gitHubUsername
5353
password = gitHubKey
5454
}
5555

5656
content {
57-
includeGroup("ch.srgssr.androidx.mediarouter")
57+
includeGroup("ch.srgssr.media.maestro")
5858
}
5959
}
6060
}

0 commit comments

Comments
 (0)