Merge pull request #58 from joreilly/dependency_updates

dependency updates

Author: joreilly

gradle/libs.versions.toml

@@ -1,34 +1,28 @@
 [versions]
-kotlin = "2.0.21"
-ksp = "2.0.21-1.0.25"
-kotlinx-coroutines = "1.9.0"
-kotlinx-serialization = "1.7.3"
-kotlinx-dateTime = "0.6.1"
-
-
-composeUiTooling = "1.3.1"
-androidGradlePlugin = "8.8.1"
-koin = "4.0.0"
-koinCompose = "4.0.0"
-koinComposeMultiplatform = "1.2.0-Beta4"
-ktor = "3.0.0"
-slf4j = "2.0.16"
-sqlDelight = "2.0.2"
-kmpNativeCoroutines = "1.0.0-ALPHA-35"
+kotlin = "2.1.21"
+ksp = "2.1.21-2.0.1"
+kotlinx-coroutines = "1.10.2"
+kotlinx-serialization = "1.8.1"
+kotlinx-dateTime = "0.6.2"
+
+
+androidGradlePlugin = "8.10.1"
+koin = "4.0.4"
+ktor = "3.1.2"
+slf4j = "2.0.17"
+sqlDelight = "2.1.0"
+kmpNativeCoroutines = "1.0.0-ALPHA-42"
 googleServices = "4.4.2"
 
-androidxActivity = "1.10.0"
-androidxComposeCompiler = "1.5.8"
-jbComposeCompiler = "1.5.4"
-androidxComposeBom = "2025.02.00"
-androidxNavigationCompose = "2.8.7"
-uiToolingPreview = "1.7.8"
-androidxLifecycle = "2.8.7"
+androidxActivity = "1.10.1"
+androidxComposeBom = "2025.06.00"
+androidxNavigationCompose = "2.9.0"
+uiToolingPreview = "1.8.2"
+androidxLifecycle = "2.9.1"
 imageLoader = "1.9.0"
 osmdroidAndroid = "6.1.20"
 googleMapsCompose = "5.0.3"
 
-composeMultiplatform = "1.7.0"
 accompanist = "0.36.0"
 coilCompose = "2.7.0"
 horologist = "0.6.20"
@@ -40,20 +34,20 @@ robolectric = "4.14.1"
 androidxTestCore = "1.6.1"
 mockito = "3.11.2"
 
-multiplatformSettings = "1.2.0"
+multiplatformSettings = "1.3.0"
 kermit = "2.0.5"
 
 minSdk = "24"
-targetSdk = "34"
-compileSdk = "34"
-coreKtx = "1.15.0"
+targetSdk = "35"
+compileSdk = "35"
+coreKtx = "1.16.0"
 espressoCore = "3.6.1"
-appcompat = "1.7.0"
+appcompat = "1.7.1"
 material = "1.12.0"
-constraintlayout = "2.2.0"
-lifecycleLivedataKtx = "2.8.7"
-navigationFragmentKtx = "2.8.7"
-navigationUiKtx = "2.8.7"
+constraintlayout = "2.2.1"
+lifecycleLivedataKtx = "2.9.1"
+navigationFragmentKtx = "2.9.0"
+navigationUiKtx = "2.9.0"
 
 
 [libraries]
@@ -100,7 +94,7 @@ horologist-composables = { module = "com.google.android.horologist:horologist-co
 androidx-navigation-compose-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigationCompose" }
 
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
-koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koinCompose" }
+koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
 koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" }
@@ -159,13 +153,10 @@ ktor-common = ["ktor-client-core", "ktor-client-json", "ktor-client-logging", "k
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
-android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kmpNativeCoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "kmpNativeCoroutines" }
 sqlDelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
-jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 googleServices = { id = "com.google.gms.google-services", version.ref = "googleServices" }
-jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun May 28 21:12:18 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

ios/GalwayBusAppSwiftUI/GalwayBusAppSwiftUI/ViewModels.swift

@@ -77,8 +77,7 @@ class BusRouteViewModel: ObservableObject {
 
     func fetch() async {
         do {
-            let busRoutes = try await asyncFunction(for: repository.fetchBusRoutes())
-            self.listRoutes = busRoutes
+            self.listRoutes = try await asyncFunction(for: repository.fetchBusRoutes())
         } catch {
             print("Failed with error: \(error)")
         }