Bump the androidx group with 10 updates (#544)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gaëtan Muller <[email protected]>
SRGSSR · May 21, 2024 · 17824a2 · 17824a2
1 parent a505e42
commit 17824a2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,16 +2,16 @@
 accompanist = "0.34.0"
 android-gradle-plugin = "8.4.1"
 androidx-activity = "1.9.0"
-androidx-annotation = "1.7.1"
+androidx-annotation = "1.8.0"
 androidx-compose = "2024.05.00"
 androidx-core = "1.13.1"
-androidx-fragment = "1.7.0"
+androidx-fragment = "1.7.1"
 androidx-leanback = "1.0.0"
-androidx-lifecycle = "2.7.0"
+androidx-lifecycle = "2.8.0"
 androidx-media = "1.7.0"
 androidx-media3 = "1.3.1"
 androidx-navigation = "2.7.7"
-androidx-paging = "3.2.1"
+androidx-paging = "3.3.0"
 androidx-test-core = "1.5.0"
 androidx-test-ext-junit = "1.1.5"
 androidx-test-monitor = "1.6.1"
@@ -49,10 +49,9 @@ androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
 androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" }
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
-androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
-androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 androidx-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "androidx-navigation" }
 androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidx-navigation" }

diff --git a/pillarbox-demo-shared/build.gradle.kts b/pillarbox-demo-shared/build.gradle.kts
@@ -18,7 +18,6 @@ dependencies {
     api(libs.androidx.compose.ui)
     api(libs.androidx.compose.ui.graphics)
     api(libs.androidx.lifecycle.viewmodel)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
     api(libs.androidx.media3.common)
     implementation(libs.androidx.media3.exoplayer)
     api(libs.androidx.navigation.common)

diff --git a/...src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/ContentListViewModel.kt b/...src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/ContentListViewModel.kt
@@ -111,7 +111,7 @@ class ContentListViewModel(
     class Factory(
         private var ilRepository: ILRepository,
         private val contentList: ContentList,
-    ) : ViewModelProvider.NewInstanceFactory() {
+    ) : ViewModelProvider.Factory {
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return ContentListViewModel(ilRepository, contentList) as T
         }

diff --git a/...ared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/SearchViewModel.kt b/...ared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/SearchViewModel.kt
@@ -149,7 +149,7 @@ class SearchViewModel(
     @Suppress("UndocumentedPublicClass")
     class Factory(
         private var ilRepository: ILRepository,
-    ) : ViewModelProvider.NewInstanceFactory() {
+    ) : ViewModelProvider.Factory {
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return SearchViewModel(ilRepository) as T
         }

diff --git a/...c/main/java/ch/srgssr/pillarbox/demo/shared/ui/player/settings/PlayerSettingsViewModel.kt b/...c/main/java/ch/srgssr/pillarbox/demo/shared/ui/player/settings/PlayerSettingsViewModel.kt
@@ -280,7 +280,7 @@ class PlayerSettingsViewModel(
     class Factory(
         private val player: Player,
         private val application: Application
-    ) : ViewModelProvider.NewInstanceFactory() {
+    ) : ViewModelProvider.Factory {
         override fun <T : ViewModel> create(modelClass: Class<T>): T {
             return PlayerSettingsViewModel(player, application) as T
         }

diff --git a/pillarbox-demo-tv/build.gradle.kts b/pillarbox-demo-tv/build.gradle.kts
@@ -32,7 +32,7 @@ dependencies {
     implementation(libs.androidx.core)
     implementation(libs.androidx.fragment)
     implementation(libs.androidx.lifecycle.common)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.viewmodel)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.media3.common)

diff --git a/pillarbox-demo/build.gradle.kts b/pillarbox-demo/build.gradle.kts
@@ -69,11 +69,10 @@ dependencies {
     implementation(libs.androidx.compose.ui.unit)
     implementation(libs.androidx.core)
     implementation(libs.androidx.lifecycle.common)
+    implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.runtime.compose)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
     implementation(libs.androidx.media)
     implementation(libs.androidx.media3.common)
     implementation(libs.androidx.media3.exoplayer)