From 20ec7706b23462ac277a9a6c0612acc23802c6b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sena=20Ayd=C4=B1n?= Date: Sun, 24 Dec 2023 18:22:38 +0300 Subject: [PATCH 1/2] Update versions --- androidApp/build.gradle.kts | 2 +- gradle/libs.versions.toml | 19 ++++++++++--------- shared/build.gradle.kts | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 877748f..c98f0f1 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -30,7 +30,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.get() + kotlinCompilerExtensionVersion = "1.5.4" } packaging { resources { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fa296fb..faf04e4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,18 +3,19 @@ minSdk = "24" targetSdk = "34" -kotlin = "1.9.10" +kotlin = "1.9.21" kotlinx-coroutines = "1.7.3" kotlinx-serialization = "1.6.0" kotlinx-datetime = "0.4.1" -ktor = "2.3.4" +ktor = "2.3.5" agp = "8.1.2" desugar_jdk_libs = "2.0.3" -compose = "1.5.3" +compose = "1.5.11" +compose-ui-tooling = "1.5.4" androidx = "1.12.0" -androidx-activity = "1.8.0" +androidx-activity = "1.8.1" androidx-appcompat = "1.6.1" -voyager = "1.0.0-rc08" +voyager = "1.0.0-rc10" napier = "2.6.1" buildKonfig = "0.14.0" koin = "3.5.0" @@ -22,7 +23,7 @@ koin-compose = "1.1.0" moko = "0.23.0" seiko = "1.5.1" mapsCompose = "2.15.0" -playServicesMaps = "18.1.0" +playServicesMaps = "18.2.0" playServicesLocation = "21.0.1" maps-secrets = "2.0.1" @@ -31,9 +32,9 @@ maps-secrets = "2.0.1" androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } -androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose" } -androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -androidx-compose-ui-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } +androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util", version.ref = "compose-ui-tooling" } +androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui-tooling" } +androidx-compose-ui-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-ui-tooling" } maps-compose = { module = "com.google.maps.android:maps-compose", version.ref = "mapsCompose" } play-services-maps = { module = "com.google.android.gms:play-services-maps", version.ref = "playServicesMaps" } play-services-location = { module = "com.google.android.gms:play-services-location", version.ref = "playServicesLocation" } diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 82b1233..f4c3524 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -190,7 +190,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.get() + kotlinCompilerExtensionVersion = "1.5.4" } } From 1616ee70e24af6bcc9306b34219740fffa5fe5f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sena=20Ayd=C4=B1n?= Date: Fri, 19 Jan 2024 11:05:19 +0300 Subject: [PATCH 2/2] Fix share action on ios --- .../kotlin/com/example/moveeapp_compose_kmm/core/Share.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/iosMain/kotlin/com/example/moveeapp_compose_kmm/core/Share.kt b/shared/src/iosMain/kotlin/com/example/moveeapp_compose_kmm/core/Share.kt index d8c4812..00d28d6 100644 --- a/shared/src/iosMain/kotlin/com/example/moveeapp_compose_kmm/core/Share.kt +++ b/shared/src/iosMain/kotlin/com/example/moveeapp_compose_kmm/core/Share.kt @@ -4,7 +4,7 @@ import com.example.moveeapp_compose_kmm.Holder import platform.UIKit.UIActivityViewController actual fun share(context: PlatformContext, text: String) { - val controller = UIActivityViewController(listOf(context), null) + val controller = UIActivityViewController(listOf(text), null) Holder.viewController?.presentViewController(controller, true, null) } \ No newline at end of file