diff --git a/apps/flipcash/app/build.gradle.kts b/apps/flipcash/app/build.gradle.kts index 0ef49c913..891bbe127 100644 --- a/apps/flipcash/app/build.gradle.kts +++ b/apps/flipcash/app/build.gradle.kts @@ -224,7 +224,6 @@ dependencies { coreLibraryDesugaring(libs.android.desugaring) //standard libraries - implementation(libs.kotlinx.collections.immutable) implementation(libs.kotlinx.serialization.json) implementation(libs.androidx.core) implementation(libs.androidx.lifecycle.runtime) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2d5785555..026788b42 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -81,7 +81,6 @@ androidxUiJUnit = "1.11.2" mixpanel = "8.7.0" timber = "5.0.1" -voyager = "1.1.0-beta03" sodium-bindings = "0.9.5" desugaring = "2.1.5" @@ -167,7 +166,7 @@ kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines" } -kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.4.0" } +kotlinx-coroutines-rx3 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx3", version.ref = "kotlinx-coroutines" } kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" } kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" } @@ -196,12 +195,9 @@ compose-view-models = { module = "androidx.lifecycle:lifecycle-viewmodel-compose compose-paging = { module = "androidx.paging:paging-compose", version.ref = "compose-paging" } compose-webview = { module = "io.github.kevinnzou:compose-webview-multiplatform", version.ref = "compose-webview" } -# Voyager -voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } -voyager-hilt = { module = "cafe.adriel.voyager:voyager-hilt", version.ref = "voyager" } -voyager-bottomsheet = { module = "cafe.adriel.voyager:voyager-bottom-sheet-navigator", version.ref = "voyager" } -voyager-tabs = { module = "cafe.adriel.voyager:voyager-tab-navigator", version.ref = "voyager" } -voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" } +# RxJava +rxjava = { module = "io.reactivex.rxjava3:rxjava", version.ref = "rxjava" } +rxandroid = { module = "io.reactivex.rxjava3:rxandroid", version.ref = "rxandroid" } # Networking / gRPC / Protobuf slf4j = { module = "org.slf4j:slf4j-android", version.ref = "slf4j" } diff --git a/ui/emojis/build.gradle.kts b/ui/emojis/build.gradle.kts index b24fc20fd..8f39799e5 100644 --- a/ui/emojis/build.gradle.kts +++ b/ui/emojis/build.gradle.kts @@ -26,5 +26,4 @@ dependencies { implementation(libs.compose.animation) implementation(libs.compose.material) implementation(libs.compose.material.icons.extended) - implementation(libs.voyager.navigator) }