Merge pull request #122 from joreilly/dependency_upddates

Kotlin 2.0 + related dependencies
joreilly · May 25, 2024 · 1df4bc0 · 1df4bc0
2 parents 87e0ca1 + 98142cd
commit 1df4bc0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # MortyCompose
 
-![kotlin-version](https://img.shields.io/badge/kotlin-2.0.0-blue)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.0.0-blue?logo=kotlin)
 
 
 Kotlin Multiplatform sample that demonstrates use of GraphQL + Jetpack Compose and SwiftUI (based on https://github.com/Dimillian/MortyUI SwiftUI project).
@@ -26,3 +26,18 @@ A small SwiftUI iOS app that uses same shared Kotlin Multiplatform code is in th
  (shows Characters screen using more or less same SwiftUI code that's in https://github.com/Dimillian/MortyUI)
 
 ![Characters iOS Screenshot](/art/characters_screenshot_ios.png?raw=true)
+
+
+## Full set of Kotlin Multiplatform/Compose/SwiftUI samples
+
+*  PeopleInSpace (https://github.com/joreilly/PeopleInSpace)
+*  GalwayBus (https://github.com/joreilly/GalwayBus)
+*  Confetti (https://github.com/joreilly/Confetti)
+*  BikeShare (https://github.com/joreilly/BikeShare)
+*  FantasyPremierLeague (https://github.com/joreilly/FantasyPremierLeague)
+*  ClimateTrace (https://github.com/joreilly/ClimateTraceKMP)
+*  GeminiKMP (https://github.com/joreilly/GeminiKMP)
+*  MortyComposeKMM (https://github.com/joreilly/MortyComposeKMM)
+*  StarWars (https://github.com/joreilly/StarWars)
+*  WordMasterKMP (https://github.com/joreilly/WordMasterKMP)
+*  Chip-8 (https://github.com/joreilly/chip-8)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,14 @@
 [versions]
 kotlin = "2.0.0"
 ksp = "2.0.0-1.0.21"
-coroutines = "1.8.1"
+kotlinx-coroutines = "1.8.1"
+
 androidGradlePlugin = "8.1.4"
 koin = "3.5.6"
 koinCompose = "3.5.6"
 apollo = "4.0.0-beta.6"
 kmpNativeCoroutines = "1.0.0-ALPHA-31"
-kmpObservableViewModel = "1.0.0-BETA-2-kotlin-2.0.0-RC3"
+kmpObservableViewModel = "1.0.0-BETA-3"
 
 androidxActivity = "1.9.0"
 androidxComposeBom = "2024.05.00"
@@ -25,8 +26,8 @@ compileSdk = "34"
 
 
 [libraries]
-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
+kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -28,7 +28,7 @@ kotlin {
 
         commonMain {
             dependencies {
-                implementation(libs.coroutines.core)
+                implementation(libs.kotlinx.coroutines)
                 implementation(libs.koin.core)
 
                 api(libs.apollo.runtime)