Merge pull request #51 from joreilly/dependency_upddates

Kotlin 2.0 + related dependencies

Author: joreilly

README.md

@@ -1,6 +1,6 @@
 ### Galway Bus Kotlin Multiplatform project using Jetpack Compose and SwiftUI
 
-![kotlin-version](https://img.shields.io/badge/kotlin-1.9.20-blue)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.0.0-blue?logo=kotlin)
 
 **Note**: if you are trying this project out and aren't in Galway then hit the home icon in title bar to center in Galway so you can see meaningful data!
 
@@ -16,16 +16,6 @@ and macOS apps. Also wrote a number of posts about some of my experiences using
 * [Using Google Maps in a Jetpack Compose app](https://johnoreilly.dev/posts/jetpack-compose-google-maps/)
 * [Using Google Maps in a Jetpack Compose app - Part 2!](https://johnoreilly.dev/posts/jetpack-compose-google-maps-part2/)
 
-Also have following Kotlin Multiplatform/Jetpack Compose/SwiftUI samples.
-
-* [PeopleInSpace](https://github.com/joreilly/PeopleInSpace)
-* [BikeShare](https://github.com/joreilly/BikeShare)
-* [MortyComposeKMM](https://github.com/joreilly/MortyComposeKMM)
-* [FantasyPremierLeague](https://github.com/joreilly/FantasyPremierLeague)
-* [StarWars](https://github.com/joreilly/StarWars)
-* [Confetti](https://github.com/joreilly/Confetti)
-* [Chip-8](https://github.com/joreilly/chip-8)
-
 
 ### Google Maps SDK
 
@@ -60,3 +50,17 @@ you can update where this is read in `build.gradle`
 * [KMP-NativeCoroutines](https://github.com/rickclephas/KMP-NativeCoroutines)
 * [Multiplatform Settings](https://github.com/russhwolf/multiplatform-settings)
 
+
+## 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)

gradle.properties

@@ -1,23 +1,13 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+#Gradle
 org.gradle.caching=true
+org.gradle.jvmargs=-Xmx4g -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.parallel=true
 
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+#Kotlin
+kotlin.code.style=official
 
+#Android
 android.useAndroidX=true
-#android.enableJetifier=true
 
-kotlin.experimental.tryK2=true
+# XCode
+xcodeproj=./ios/GalwayBusAppSwiftUI

gradle/libs.versions.toml

@@ -1,11 +1,13 @@
 [versions]
-composeUiTooling = "1.3.1"
 kotlin = "2.0.0"
 ksp = "2.0.0-1.0.21"
-coroutines = "1.8.1"
-kotlinxSerialization = "1.6.3"
-kotlinxDateTime = "0.6.0"
-androidGradlePlugin = "8.4.0"
+kotlinx-coroutines = "1.8.1"
+kotlinx-serialization = "1.6.3"
+kotlinx-dateTime = "0.6.0"
+
+
+composeUiTooling = "1.3.1"
+androidGradlePlugin = "8.4.1"
 koin = "3.6.0-Beta4"
 koinCompose = "3.6.0-Beta4"
 koinComposeMultiplatform = "1.2.0-Beta4"
@@ -57,13 +59,14 @@ navigationUiKtx = "2.7.7"
 
 
 [libraries]
+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" }
+kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinx-dateTime" }
+kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
+
 androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "uiToolingPreview" }
 androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreview" }
 wear-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "composeUiTooling" }
-kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
-kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
-kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDateTime" }
-kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" }
 
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }