Update to AGP 9.1.1 / Kotlin 2.4.10 baseline

Bring GalwayBus in line with the other KMP samples: Kotlin 2.4.10, AGP 9.1.1
(Gradle 9.5.0), KSP 2.3.10, coroutines 1.11.0, ktor 3.5.1, koin 4.2.2,
serialization 1.11.0, KMP-NativeCoroutines 1.0.5.

AGP 9 no longer allows com.android.library alongside the Kotlin Multiplatform
plugin, so SharedCode moves to com.android.kotlin.multiplatform.library with
its Android config nested under kotlin { android { } }, and android-app drops
kotlin("android") in favour of AGP's built-in Kotlin. Also handle AGP 9 default
changes: proguard-android-optimize.txt is now required, and resValues must be
explicitly enabled for the Maps API key.

Fix stale macosMain source that still referenced SQLDelight 1.x
(com.squareup) and the removed AppleSettings API, so the macOS target compiles
again.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: joreilly

SharedCode/build.gradle.kts

@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 plugins {
     kotlin("multiplatform")
     id("kotlinx-serialization")
-    id("com.android.library")
+    id("com.android.kotlin.multiplatform.library")
     id("app.cash.sqldelight")
     id("com.google.devtools.ksp")
     id("com.rickclephas.kmp.nativecoroutines")
@@ -17,23 +17,8 @@ plugins {
 version = "1.0"
 
 
-android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
-    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-    namespace = "com.surrus.galwaybus.lib"
-}
-
-
 kotlin {
+    jvmToolchain(17)
     applyDefaultHierarchyTemplate()
 
     listOf(
@@ -47,7 +32,12 @@ kotlin {
     }
 
     macosX64("macos")
-    androidTarget()
+
+    android {
+        namespace = "com.surrus.galwaybus.lib"
+        compileSdk = libs.versions.compileSdk.get().toInt()
+        minSdk = libs.versions.minSdk.get().toInt()
+    }
     jvm()
 
     sourceSets {

SharedCode/src/macosMain/kotlin/common/Platform.kt

@@ -1,12 +1,19 @@
 package com.surrus.galwaybus.common.di
 
-import com.russhwolf.settings.AppleSettings
-import com.russhwolf.settings.ExperimentalSettingsApi
+import app.cash.sqldelight.driver.native.NativeSqliteDriver
+import com.russhwolf.settings.NSUserDefaultsSettings
 import com.russhwolf.settings.ObservableSettings
+import com.surrus.galwaybus.db.MyDatabase
 import org.koin.dsl.module
 import platform.Foundation.NSUserDefaults
 
-@OptIn(ExperimentalSettingsApi::class)
 actual fun platformModule() = module {
-    single<ObservableSettings> { AppleSettings(NSUserDefaults.standardUserDefaults) }
+    single<ObservableSettings> { NSUserDefaultsSettings(NSUserDefaults.standardUserDefaults) }
+    single { createDb() }
+}
+
+
+fun createDb(): MyDatabase {
+    val driver = NativeSqliteDriver(MyDatabase.Schema, "galwaybus.db")
+    return MyDatabase(driver)
 }

SharedCode/src/macosMain/kotlin/common/di/KoiniOS.kt

@@ -4,7 +4,6 @@ import java.util.*
 
 plugins {
     alias(libs.plugins.android.application)
-    kotlin("android")
     alias(libs.plugins.googleServices)
     alias(libs.plugins.compose.compiler)
 }
@@ -77,13 +76,14 @@ android {
 
     buildFeatures {
         compose = true
+        resValues = true
     }
 
     buildTypes {
         getByName("release") {
             isShrinkResources = true
             isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             signingConfig = signingConfigs.getByName("release")
         }
     }

android-app/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.kotlinx.serialization) apply false

build.gradle.kts

@@ -1,17 +1,17 @@
 [versions]
-kotlin = "2.2.0"
-ksp = "2.2.0-2.0.2"
-kotlinx-coroutines = "1.10.2"
-kotlinx-serialization = "1.9.0"
+kotlin = "2.4.10"
+ksp = "2.3.10"
+kotlinx-coroutines = "1.11.0"
+kotlinx-serialization = "1.11.0"
 kotlinx-dateTime = "0.7.1"
 
 
-androidGradlePlugin = "8.12.0"
-koin = "4.1.0"
-ktor = "3.2.3"
+androidGradlePlugin = "9.1.1"
+koin = "4.2.2"
+ktor = "3.5.1"
 slf4j = "2.0.17"
 sqlDelight = "2.1.0"
-kmpNativeCoroutines = "1.0.0-ALPHA-45"
+kmpNativeCoroutines = "1.0.5"
 googleServices = "4.4.3"
 
 androidxActivity = "1.10.1"
@@ -157,6 +157,7 @@ ktor-common = ["ktor-client-core", "ktor-client-json", "ktor-client-logging", "k
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "androidGradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

gradle/libs.versions.toml

@@ -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-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists