From a4ccc41728cea47bcb0606b2c47461735d1835bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 05:26:05 +0000 Subject: [PATCH 1/3] Bump the androidx group with 10 updates Bumps the androidx group with 10 updates: | Package | From | To | | --- | --- | --- | | androidx.annotation:annotation | `1.7.1` | `1.8.0` | | androidx.fragment:fragment | `1.7.0` | `1.7.1` | | androidx.lifecycle:lifecycle-common | `2.7.0` | `2.8.0` | | androidx.lifecycle:lifecycle-runtime-compose | `2.7.0` | `2.8.0` | | androidx.lifecycle:lifecycle-runtime-ktx | `2.7.0` | `2.8.0` | | androidx.lifecycle:lifecycle-viewmodel | `2.7.0` | `2.8.0` | | androidx.lifecycle:lifecycle-viewmodel-ktx | `2.7.0` | `2.8.0` | | androidx.lifecycle:lifecycle-viewmodel-compose | `2.7.0` | `2.8.0` | | androidx.paging:paging-common | `3.2.1` | `3.3.0` | | androidx.paging:paging-compose | `3.2.1` | `3.3.0` | Updates `androidx.annotation:annotation` from 1.7.1 to 1.8.0 Updates `androidx.fragment:fragment` from 1.7.0 to 1.7.1 Updates `androidx.lifecycle:lifecycle-common` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-runtime-compose` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-runtime-ktx` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-viewmodel` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-viewmodel-ktx` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-viewmodel-compose` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-runtime-compose` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-runtime-ktx` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-viewmodel` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-viewmodel-ktx` from 2.7.0 to 2.8.0 Updates `androidx.lifecycle:lifecycle-viewmodel-compose` from 2.7.0 to 2.8.0 Updates `androidx.paging:paging-common` from 3.2.1 to 3.3.0 Updates `androidx.paging:paging-compose` from 3.2.1 to 3.3.0 Updates `androidx.paging:paging-compose` from 3.2.1 to 3.3.0 --- updated-dependencies: - dependency-name: androidx.annotation:annotation dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.fragment:fragment dependency-type: direct:production update-type: version-update:semver-patch dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-common dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-runtime-compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-runtime-ktx dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-viewmodel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-viewmodel-ktx dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-viewmodel-compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-runtime-compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-runtime-ktx dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-viewmodel dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-viewmodel-ktx dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.lifecycle:lifecycle-viewmodel-compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.paging:paging-common dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.paging:paging-compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx - dependency-name: androidx.paging:paging-compose dependency-type: direct:production update-type: version-update:semver-minor dependency-group: androidx ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8eafd5a08..88623ebbe 100644 --- 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" From 217649c17c6770d5715ca7d5026d72e502607990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Tue, 21 May 2024 08:47:03 +0200 Subject: [PATCH 2/3] Address Dependency Analysis warnings --- gradle/libs.versions.toml | 3 +-- pillarbox-demo-shared/build.gradle.kts | 1 - pillarbox-demo-tv/build.gradle.kts | 2 +- pillarbox-demo/build.gradle.kts | 3 +-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 88623ebbe..29c21a2c7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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 index 5c221e21b..6ac999321 100644 --- 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/pillarbox-demo-tv/build.gradle.kts b/pillarbox-demo-tv/build.gradle.kts index bc1ed2263..83f124995 100644 --- 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 index 61d254be8..fcb95f587 100644 --- 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) From 47e3406e6cf9aa9f360c69fec655c95950e75855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= Date: Tue, 21 May 2024 08:49:23 +0200 Subject: [PATCH 3/3] Replace `ViewModelProvider.NewInstanceFactory()` with `ViewModelProvider.Factory` --- .../demo/shared/ui/integrationLayer/ContentListViewModel.kt | 2 +- .../demo/shared/ui/integrationLayer/SearchViewModel.kt | 2 +- .../demo/shared/ui/player/settings/PlayerSettingsViewModel.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/ContentListViewModel.kt b/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/ContentListViewModel.kt index 504145051..fe6aa0860 100644 --- a/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/ContentListViewModel.kt +++ b/pillarbox-demo-shared/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 create(modelClass: Class): T { return ContentListViewModel(ilRepository, contentList) as T } diff --git a/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/SearchViewModel.kt b/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/SearchViewModel.kt index 458d091aa..f879c46f0 100644 --- a/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/integrationLayer/SearchViewModel.kt +++ b/pillarbox-demo-shared/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 create(modelClass: Class): T { return SearchViewModel(ilRepository) as T } diff --git a/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/player/settings/PlayerSettingsViewModel.kt b/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/player/settings/PlayerSettingsViewModel.kt index fe8878d9c..b4ac8681f 100644 --- a/pillarbox-demo-shared/src/main/java/ch/srgssr/pillarbox/demo/shared/ui/player/settings/PlayerSettingsViewModel.kt +++ b/pillarbox-demo-shared/src/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 create(modelClass: Class): T { return PlayerSettingsViewModel(player, application) as T }