diff --git a/app/tv/build.gradle.kts b/app/tv/build.gradle.kts index 8be41f4e..f9eed3ef 100644 --- a/app/tv/build.gradle.kts +++ b/app/tv/build.gradle.kts @@ -82,12 +82,15 @@ ktlint { } dependencies { + val composeBom = platform(libs.androidx.compose.bom) + implementation(projects.core) implementation(projects.data) implementation(projects.preferences) implementation(projects.player.core) implementation(projects.player.video) implementation(libs.androidx.activity.compose) + implementation(composeBom) implementation(libs.androidx.compose.ui.tooling.preview) implementation(libs.androidx.compose.material3) implementation(libs.androidx.core) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 7a4d7ff5..e776253c 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -11,6 +11,6 @@ object Versions { val java = JavaVersion.VERSION_17 - const val composeCompiler = "1.5.9" + const val composeCompiler = "1.5.10" const val ktlint = "0.50.0" } \ No newline at end of file diff --git a/core/build.gradle.kts b/core/build.gradle.kts index c046d487..04903fa4 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -53,11 +53,14 @@ ktlint { } dependencies { + val composeBom = platform(libs.androidx.compose.bom) + 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) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f54310a4..f5d9e366 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,8 +3,8 @@ aboutlibraries = "10.10.0" android-plugin = "8.2.2" androidx-activity = "1.8.2" androidx-appcompat = "1.6.1" +androidx-compose-bom = "2024.02.01" androidx-compose-material3 = "1.2.0" -androidx-compose-ui = "1.6.1" androidx-constraintlayout = "2.1.4" androidx-core = "1.12.0" androidx-hilt = "1.1.0" @@ -36,10 +36,11 @@ aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutl androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } +androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidx-compose-bom" } androidx-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidx-compose-material3" } -androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose-ui" } -androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "androidx-compose-ui" } +androidx-compose-ui = { module = "androidx.compose.ui:ui" } +androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" } androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" } androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" }