Merge remote-tracking branch 'origin/main' into native_image

# Conflicts:
#	mcp-server/build.gradle.kts
#	mcp-server/src/main/kotlin/McpServer.kt

Author: yschimke

.github/workflows/ios.yml

@@ -19,7 +19,7 @@ jobs:
           java-version: 21
 
       - name: Build iOS app
-        run: xcodebuild -allowProvisioningUpdates -allowProvisioningUpdates -workspace iosApp/iosApp.xcodeproj/project.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 15'
+        run: xcodebuild -allowProvisioningUpdates -allowProvisioningUpdates -workspace iosApp/iosApp.xcodeproj/project.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 16'
 
 
 

composeApp/src/jvmMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.desktop.kt

@@ -4,6 +4,7 @@ import dev.johnoreilly.climatetrace.remote.Country
 import io.github.xxfast.kstore.KStore
 import io.github.xxfast.kstore.file.storeOf
 import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
 import net.harawata.appdirs.AppDirsFactory
 import org.koin.core.module.Module
 import org.koin.dsl.module
@@ -15,7 +16,9 @@ private const val AUTHOR = "johnoreilly"
 actual fun dataModule(): Module = module {
     single<KStore<List<Country>>> {
         val filesDir: String = AppDirsFactory.getInstance()
-            .getUserDataDir(PACKAGE_NAME, VERSION, AUTHOR)
+            .getUserCacheDir(PACKAGE_NAME, VERSION, AUTHOR)
+        val files = Path(filesDir)
+        with(SystemFileSystem) { if(!exists(files)) createDirectories(files) }
         storeOf(file = Path(path = "$filesDir/countries.json"), default = emptyList())
     }
 }

mcp-server/build.gradle.kts

@@ -3,6 +3,7 @@
 plugins {
     alias(libs.plugins.kotlinJvm)
     alias(libs.plugins.kotlinx.serialization)
+    alias(libs.plugins.jib)
     application
     id("org.graalvm.buildtools.native") version "0.11.0"
 }
@@ -17,13 +18,11 @@ dependencies {
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(24))
-        vendor.set(JvmVendorSpec.GRAAL_VM)
-        nativeImageCapable.set(true)
     }
 }
 
 application {
-    mainClass = "MainKt"
+    mainClass = "McpServerKt"
 }
 
 graalvmNative {
@@ -46,3 +45,14 @@ graalvmNative {
     }
 }
 
+jib {
+    from.image = "docker.io/library/eclipse-temurin:21"
+
+    to {
+        image = "gcr.io/climatetrace-mcp/climatetrace-mcp-server"
+    }
+    container {
+        ports = listOf("8080")
+        mainClass = "McpServerKt"
+    }
+}

mcp-server/src/main/kotlin/McpServer.kt

@@ -16,9 +16,23 @@ import kotlinx.serialization.json.jsonPrimitive
 import kotlinx.serialization.json.putJsonObject
 
 
-private val koin = initKoin(enableNetworkLogs = true).koin
 
 
+fun main(args: Array<String>) {
+    val command = args.firstOrNull() ?: "--sse-server"
+    val port = args.getOrNull(1)?.toIntOrNull() ?: 8080
+    when (command) {
+        "--sse-server" -> `run sse mcp server`(port)
+        "--stdio" -> `run mcp server using stdio`()
+        else -> {
+            System.err.println("Unknown command: $command")
+        }
+    }
+}
+
+
+private val koin = initKoin(enableNetworkLogs = true).koin
+
 fun configureMcpServer(): Server {
     val climateTraceRepository = koin.get<ClimateTraceRepository>()
 
@@ -67,7 +81,6 @@ fun configureMcpServer(): Server {
                 content = listOf(TextContent("The 'countryCodeList' parameters are required."))
             )
         }
-
         val countryAssetEmissionInfo = climateTraceRepository.fetchCountryAssetEmissionsInfo(
             countryCodeList = countryCodeList
                 .jsonArray