Merge pull request #39 from joreilly/update_dependencies

update dependencies

Author: joreilly

SharedCode/SharedCode.podspec

@@ -3,7 +3,6 @@ plugins {
     kotlin("multiplatform")
     id("kotlinx-serialization")
     id("com.android.library")
-    id("org.jetbrains.kotlin.native.cocoapods")
     id("com.squareup.sqldelight")
     id("com.google.devtools.ksp")
     id("com.rickclephas.kmp.nativecoroutines")
@@ -13,12 +12,12 @@ plugins {
 version = "1.0"
 
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = listOf("-Xuse-experimental=kotlin.time.ExperimentalTime", "-Xobjc-generics")
-    }
-}
+//tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+//    kotlinOptions {
+//        jvmTarget = "1.8"
+//        freeCompilerArgs = listOf("-Xuse-experimental=kotlin.time.ExperimentalTime", "-Xobjc-generics")
+//    }
+//}
 
 
 android {
@@ -30,6 +29,10 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     namespace = "com.surrus.galwaybus.lib"
 }
 
@@ -41,20 +44,23 @@ kotlin {
             System.getenv("NATIVE_ARCH")?.startsWith("arm") == true -> ::iosSimulatorArm64 // available to KT 1.5.30
             else -> ::iosX64
         }
-        iosTarget("iOS") {}
+        iosTarget("iOS") {
+            binaries.framework {
+                baseName = "SharedCode"
+
+                // re. https://youtrack.jetbrains.com/issue/KT-60230/Native-unknown-options-iossimulatorversionmin-sdkversion-with-Xcode-15-beta-3
+                // due to be fixed in Kotlin 1.9.10
+                if (System.getenv("XCODE_VERSION_MAJOR") == "1500") {
+                    linkerOpts += "-ld64"
+                }
+            }
+        }
 
         macosX64("macOS")
         androidTarget()
         jvm()
     }
 
-    cocoapods {
-        // Configure fields required by CocoaPods.
-        summary = "Some description for a Kotlin/Native module"
-        homepage = "Link to a Kotlin/Native module homepage"
-    }
-
-
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -145,3 +151,7 @@ kotlin.sourceSets.all {
     languageSettings.optIn("kotlin.experimental.ExperimentalObjCName")
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions.jvmTarget = "17"
+}
+

SharedCode/build.gradle.kts

@@ -91,12 +91,13 @@ android {
             signingConfig = signingConfigs.getByName("release")
         }
     }
+
     compileOptions {
         // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
 
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     packaging {
@@ -108,23 +109,13 @@ android {
     namespace = "dev.johnoreilly.galwaybus"
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs = listOf(
-            "-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check",
-            "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xuse-experimental=kotlin.time.ExperimentalTime"
-        )
-    }
-}
 
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
 
     implementation(platform("com.google.firebase:firebase-bom:26.2.0"))
     implementation("com.google.firebase:firebase-analytics-ktx")
-    implementation("androidx.activity:activity-compose:1.7.1")
+    implementation("androidx.activity:activity-compose:1.7.2")
 
 
     with(Deps.Koin) {

android-app/build.gradle.kts

@@ -202,8 +202,8 @@ fun BusStopView(stop: BusStop, stopSelected : (stop : BusStop) -> Unit, isFavori
         ListItem(
             colors = ListItemDefaults.colors(containerColor = Color.Transparent),
             modifier = Modifier.clickable(onClick = { stopSelected(stop) }),
-            headlineText = { Text(headlineText, fontWeight = FontWeight.Bold) },
-            supportingText = { Text(supportingText) },
+            headlineContent = { Text(headlineText, fontWeight = FontWeight.Bold) },
+            supportingContent = { Text(supportingText) },
             trailingContent = {
                 FavoritesButton(isFavorite = isFavorite, onClick = onToggleFavorite)
             }
@@ -212,7 +212,7 @@ fun BusStopView(stop: BusStop, stopSelected : (stop : BusStop) -> Unit, isFavori
         ListItem(
             colors = ListItemDefaults.colors(containerColor = Color.Transparent),
             modifier = Modifier.clickable(onClick = { stopSelected(stop) }),
-            headlineText = { Text(headlineText) },
+            headlineContent = { Text(headlineText) },
             trailingContent = {
                 FavoritesButton(isFavorite = isFavorite, onClick = onToggleFavorite)
             }

android-app/src/main/java/dev/johnoreilly/galwaybus/ui/screens/NearbyBusStopsScreen.kt

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.0.2")
+        classpath("com.android.tools.build:gradle:8.1.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
         classpath("com.squareup.sqldelight:gradle-plugin:${Versions.sqlDelight}")

build.gradle.kts

@@ -1,26 +1,26 @@
 
 object Versions {
-    const val kotlin = "1.9.0-Beta"
-    const val kspPlugin = "1.9.0-Beta-1.0.11"
-    const val kotlinCoroutines = "1.7.1"
+    const val kotlin = "1.9.0"
+    const val kspPlugin = "1.9.0-1.0.12"
+    const val kotlinCoroutines = "1.7.3"
     const val kotlinxSerialization = "1.5.1"
-    const val ktor = "2.3.0"
-    const val koinCore = "3.4.0"
-    const val koinAndroid = "3.4.0"
-    const val koinAndroidCompose = "3.4.4"
+    const val ktor = "2.3.2"
+    const val koinCore = "3.4.3"
+    const val koinAndroid = "3.4.3"
+    const val koinAndroidCompose = "3.4.6"
 
     const val sqlDelight = "1.5.5"
     const val kotlinxDateTime = "0.4.0"
     const val multiplatformSettings = "1.0.0"
 
-    const val kmpNativeCoroutines = "1.0.0-ALPHA-10-kotlin-1.9.0-Beta"
+    const val kmpNativeCoroutines = "1.0.0-ALPHA-13"
 
     const val compose = "1.4.3"
-    const val composeCompiler = "1.4.7-dev-k1.9.0-Beta-bb7dc8b44eb"
+    const val composeCompiler = "1.5.1"
     const val navCompose = "2.5.3"
     const val accompanist = "0.29.0-alpha"
     const val mapsCompose = "2.11.0"
-    const val composeMaterial3 = "1.0.0"
+    const val composeMaterial3 = "1.1.1"
 
     const val kermit = "1.0.0"
     const val slf4j = "1.7.30"
@@ -33,7 +33,7 @@ object Versions {
 
 object AndroidSdk {
     const val min = 21
-    const val compile = 33
+    const val compile = 34
     const val target = compile
 }
 

buildSrc/src/main/java/Dependencies.kt

@@ -19,3 +19,5 @@ org.gradle.caching=true
 
 android.useAndroidX=true
 android.enableJetifier=true
+
+#kotlin.experimental.tryK2=true