From ef5685ce639c2b05defb76ffd81833d38d3be5dc Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Thu, 9 May 2024 12:30:23 +0200 Subject: [PATCH] chore: clean up dependencies --- app/phone/build.gradle.kts | 2 -- app/tv/build.gradle.kts | 6 +++--- core/build.gradle.kts | 3 --- gradle/libs.versions.toml | 2 +- player/core/build.gradle.kts | 5 ----- player/video/build.gradle.kts | 1 - 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/app/phone/build.gradle.kts b/app/phone/build.gradle.kts index b9a5e35e..9aa095ae 100644 --- a/app/phone/build.gradle.kts +++ b/app/phone/build.gradle.kts @@ -103,9 +103,7 @@ dependencies { implementation(libs.androidx.constraintlayout) implementation(libs.androidx.core) implementation(libs.androidx.hilt.work) - implementation(libs.androidx.lifecycle.runtime) implementation(libs.androidx.lifecycle.viewmodel) - implementation(libs.androidx.media3.exoplayer) implementation(libs.androidx.media3.ui) implementation(libs.androidx.media3.session) implementation(libs.androidx.navigation.fragment) diff --git a/app/tv/build.gradle.kts b/app/tv/build.gradle.kts index f9eed3ef..d2ae3153 100644 --- a/app/tv/build.gradle.kts +++ b/app/tv/build.gradle.kts @@ -95,12 +95,13 @@ dependencies { implementation(libs.androidx.compose.material3) implementation(libs.androidx.core) implementation(libs.androidx.hilt.navigation.compose) - implementation(libs.androidx.lifecycle.runtime) implementation(libs.androidx.lifecycle.viewmodel.compose) implementation(libs.androidx.media3.exoplayer) implementation(libs.androidx.media3.ui) implementation(libs.androidx.media3.session) implementation(libs.androidx.paging.compose) + implementation(libs.androidx.tv.foundation) + implementation(libs.androidx.tv.material) implementation(libs.coil.compose) implementation(libs.coil.svg) implementation(libs.compose.destinations.core) @@ -108,8 +109,7 @@ dependencies { implementation(libs.hilt.android) ksp(libs.hilt.compiler) implementation(libs.jellyfin.core) - implementation(libs.androidx.tv.foundation) - implementation(libs.androidx.tv.material) + implementation(libs.media3.ffmpeg.decoder) debugImplementation(libs.androidx.compose.ui.tooling) } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 33930d84..d23fee0f 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -57,16 +57,13 @@ dependencies { implementation(projects.data) implementation(projects.preferences) implementation(projects.player.core) - implementation(libs.androidx.activity) implementation(libs.androidx.appcompat) implementation(composeBom) implementation(libs.androidx.compose.ui) implementation(libs.androidx.core) implementation(libs.androidx.hilt.work) ksp(libs.androidx.hilt.compiler) - implementation(libs.androidx.lifecycle.runtime) implementation(libs.androidx.lifecycle.viewmodel) - implementation(libs.androidx.navigation.fragment) implementation(libs.androidx.paging) implementation(libs.androidx.preference) implementation(libs.androidx.room.runtime) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 58409f2d..0f2588bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -56,7 +56,7 @@ androidx-core = { group = "androidx.core", name = "core", version.ref = "android androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidx-hilt" } androidx-hilt-work = { group = "androidx.hilt", name = "hilt-work", version.ref = "androidx-hilt" } androidx-hilt-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.ref = "androidx-hilt" } -androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime", version.ref = "androidx-lifecycle" } +androidx-lifecycle-runtime = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } androidx-media3-common = { group = "androidx.media3", name = "media3-common", version.ref = "androidx-media3" } diff --git a/player/core/build.gradle.kts b/player/core/build.gradle.kts index 0293020a..91d45fd9 100644 --- a/player/core/build.gradle.kts +++ b/player/core/build.gradle.kts @@ -36,10 +36,5 @@ ktlint { } dependencies { - implementation(projects.data) - implementation(projects.preferences) - implementation(libs.androidx.core) - implementation(libs.androidx.preference) - implementation(libs.jellyfin.core) implementation(libs.timber) } diff --git a/player/video/build.gradle.kts b/player/video/build.gradle.kts index 5b4ea8d8..2653116e 100644 --- a/player/video/build.gradle.kts +++ b/player/video/build.gradle.kts @@ -41,7 +41,6 @@ dependencies { implementation(projects.player.core) implementation(projects.data) implementation(projects.preferences) - implementation(libs.androidx.core) implementation(libs.androidx.lifecycle.runtime) implementation(libs.androidx.lifecycle.viewmodel) implementation(libs.androidx.media3.exoplayer)