diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 99cdf81..89c4cf2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,13 +5,13 @@ gradle-buildconfig-plugin = "com.github.gmazzo.buildconfig:5.5.0" android-application = "com.android.application:8.6.1" android-library = "com.android.library:8.6.1" -kotlin-android = "org.jetbrains.kotlin.android:2.0.0-RC1" -kotlin-jvm = "org.jetbrains.kotlin.jvm:2.0.0-RC1" -kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:2.0.0-RC1" -compose-multiplatform = "org.jetbrains.compose:1.7.0-rc01" -compose-compiler = "org.jetbrains.kotlin.plugin.compose:2.0.0-RC1" -kotlin-ksp = "com.google.devtools.ksp:2.0.0-1.0.24" -kotlinx-serialization = "org.jetbrains.kotlin.plugin.serialization:2.0.0-RC1" +kotlin-android = "org.jetbrains.kotlin.android:2.0.21" +kotlin-jvm = "org.jetbrains.kotlin.jvm:2.0.21" +kotlin-multiplatform = "org.jetbrains.kotlin.multiplatform:2.0.21" +compose-multiplatform = "org.jetbrains.compose:1.7.0" +compose-compiler = "org.jetbrains.kotlin.plugin.compose:2.0.21" +kotlin-ksp = "com.google.devtools.ksp:2.0.21-1.0.25" +kotlinx-serialization = "org.jetbrains.kotlin.plugin.serialization:2.0.21" wire = "com.squareup.wire:5.1.0" ktlint-plugin = "org.jlleitschuh.gradle.ktlint:11.6.1" spotless-plugin = "com.diffplug.spotless:6.25.0" @@ -27,7 +27,7 @@ ludi-android-common = { id = "ludi.android.common", version = "unspecified" } androidx-core-ktx = "androidx.core:core-ktx:1.13.1" androidx-activity-compose = "androidx.activity:activity-compose:1.9.2" -androidx-compose-ui-test-junit4 = "androidx.compose.ui:ui-test-junit4:1.7.2" +androidx-compose-ui-test-junit4 = "androidx.compose.ui:ui-test-junit4:1.7.3" material3-windowsizeclass = "dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0" androidx-browser = "androidx.browser:browser:1.8.0" kmpalette-core = "com.kmpalette:kmpalette-core:3.1.0" @@ -35,15 +35,15 @@ views-material = "com.google.android.material:material:1.12.0" splash-screen = "androidx.core:core-splashscreen:1.0.1" androidx-annotations = "androidx.annotation:annotation:1.8.2" leakcanary = "com.squareup.leakcanary:leakcanary-android:2.14" -coil = "io.coil-kt.coil3:coil:3.0.0-alpha10" -coil-compose = "io.coil-kt.coil3:coil-compose:3.0.0-alpha10" -coil-network-ktor = "io.coil-kt.coil3:coil-network-ktor2:3.0.0-alpha10" +coil = "io.coil-kt.coil3:coil:3.0.0-rc01" +coil-compose = "io.coil-kt.coil3:coil-compose:3.0.0-rc01" +coil-network-ktor = "io.coil-kt.coil3:coil-network-ktor3:3.0.0-rc01" # Update with caution as support for loading images in html feature currently break article card layout compose-richeditor = "com.mohamedrejeb.richeditor:richeditor-compose:1.0.0-rc05" kermit = "co.touchlab:kermit:2.0.4" -firebase-bom = "com.google.firebase:firebase-bom:33.3.0" -firebase-crashlytics = "com.google.firebase:firebase-crashlytics:19.1.0" -firebase-analytics = "com.google.firebase:firebase-analytics:22.1.0" +firebase-bom = "com.google.firebase:firebase-bom:33.4.0" +firebase-crashlytics = "com.google.firebase:firebase-crashlytics:19.2.0" +firebase-analytics = "com.google.firebase:firebase-analytics:22.1.2" bugsnag = "com.bugsnag:bugsnag:3.7.2" androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.8.6" androidx-lifecycle-runtime-compose = "androidx.lifecycle:lifecycle-runtime-compose:2.8.6" @@ -68,11 +68,11 @@ kotlin-inject-runtime = "me.tatarka.inject:kotlin-inject-runtime:0.7.2" lyricist-core = "cafe.adriel.lyricist:lyricist:1.7.0" lyricist-processor = "cafe.adriel.lyricist:lyricist-processor:1.7.0" rss-parser = "com.prof18.rssparser:rssparser:6.0.8" -ktor-core = "io.ktor:ktor-client-core:2.3.12" -ktor-okhttp = "io.ktor:ktor-client-okhttp:2.3.12" -ktor-client-mock = "io.ktor:ktor-client-mock:2.3.12" -ktor-content-negotation = "io.ktor:ktor-client-content-negotiation:2.3.12" -ktor-kotlinx-serialization = "io.ktor:ktor-serialization-kotlinx-json:2.3.12" +ktor-core = "io.ktor:ktor-client-core:3.0.0" +ktor-okhttp = "io.ktor:ktor-client-okhttp:3.0.0" +ktor-client-mock = "io.ktor:ktor-client-mock:3.0.0" +ktor-content-negotation = "io.ktor:ktor-client-content-negotiation:3.0.0" +ktor-kotlinx-serialization = "io.ktor:ktor-serialization-kotlinx-json:3.0.0" paging-common = "app.cash.paging:paging-common:3.3.0-alpha02-0.5.1" paging-compose = "app.cash.paging:paging-compose-common:3.3.0-alpha02-0.5.1" paging-testing = "app.cash.paging:paging-testing:3.3.0-alpha02-0.5.1" @@ -80,8 +80,8 @@ junit = "junit:junit:4.13.2" strikt = "io.strikt:strikt-core:0.35.1" turbine = "app.cash.turbine:turbine:1.1.0" robolectric = "org.robolectric:robolectric:4.13" -guava = "com.google.guava:guava:33.3.0-android" -test-parameter-injector = "com.google.testparameterinjector:test-parameter-injector:1.17" +guava = "com.google.guava:guava:33.3.1-android" +test-parameter-injector = "com.google.testparameterinjector:test-parameter-injector:1.18" kotlinx-coroutines-swing = "org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.9.0" kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0" kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3" diff --git a/settings.gradle.kts b/settings.gradle.kts index fa31978..6b22712 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -39,7 +39,6 @@ dependencyResolutionManagement { mavenCentral() maven { url = URI.create("https://jitpack.io") } maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - maven("https://androidx.dev/storage/compose-compiler/repository/") } } rootProject.name = "Ludi" diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index a1c9e3b..a40485d 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -93,7 +93,6 @@ kotlin { implementation(compose.materialIconsExtended) implementation(compose.components.resources) implementation(compose.foundation) - implementation(compose.compiler.auto) implementation(compose.runtime) implementation(libs.compose.richeditor) // Coil diff --git a/shared/src/commonMain/kotlin/com/mr3y/ludi/shared/ui/screens/deals/SegmentedTabRow.kt b/shared/src/commonMain/kotlin/com/mr3y/ludi/shared/ui/screens/deals/SegmentedTabRow.kt index 511ce7c..94090b1 100644 --- a/shared/src/commonMain/kotlin/com/mr3y/ludi/shared/ui/screens/deals/SegmentedTabRow.kt +++ b/shared/src/commonMain/kotlin/com/mr3y/ludi/shared/ui/screens/deals/SegmentedTabRow.kt @@ -229,6 +229,7 @@ object SegmentedTabRowDefaults { } @Immutable +@ConsistentCopyVisibility data class SegmentedTabRowColors internal constructor( private val selectedContainerColor: Color, private val selectedContentColor: Color,