Merge pull request #226 from joreilly/dep_updates

joreilly · web-flow · commit 40039b30d953 · 2026-01-16T17:04:18.000Z
dependency updates
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.3.0-blue?logo=kotlin)
 
 Kotlin/Compose Multiplatform project to show climate related emission data from https://climatetrace.org/data. Development just started so very much work in progress right now!
 Have started with showing sector emission data per country but ton of other info available as well (ideas very welcome!).
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgentProvider.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceAgentProvider.kt
@@ -122,7 +122,7 @@ class ClimateTraceAgentProvider(
         ) {
             install(EventHandler) {
                 onToolCallStarting { ctx ->
-                    onToolCallEvent("Tool ${ctx.tool.name}, args ${ctx.toolArgs}")
+                    onToolCallEvent("Tool ${ctx.toolName}, args ${ctx.toolArgs}")
                 }
 
                 
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceTool.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ClimateTraceTool.kt
@@ -3,9 +3,6 @@
 package dev.johnoreilly.climatetrace.agent
 
 import ai.koog.agents.core.tools.SimpleTool
-import ai.koog.agents.core.tools.ToolDescriptor
-import ai.koog.agents.core.tools.ToolParameterDescriptor
-import ai.koog.agents.core.tools.ToolParameterType
 import ai.koog.agents.core.tools.annotations.LLMDescription
 import dev.johnoreilly.climatetrace.data.ClimateTraceRepository
 import dev.johnoreilly.climatetrace.remote.Country
@@ -17,19 +14,20 @@ import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 
 
-class GetCountryTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetCountryTool.Args>() {
+class GetCountryTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetCountryTool.Args>(
+    argsSerializer = Args.serializer(),
+    name = "GetCountryTool",
+    description = "Look up country code using country name"
+) {
     @Serializable
     data class Args(
         @property:LLMDescription("Country name")
         val countryName: String
     )
 
-    override val argsSerializer = Args.serializer()
-    override val description = "Look up country code using country name"
-
     private var countryList: List<Country>? = null
 
-    override suspend fun doExecute(args: Args): String {
+    override suspend fun execute(args: Args): String {
         try {
             if (countryList == null) {
                 countryList = climateTraceRepository.fetchCountries()
@@ -43,57 +41,55 @@ class GetCountryTool(val climateTraceRepository: ClimateTraceRepository) : Simpl
 }
 
 
-class GetEmissionsTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetEmissionsTool.Args>() {
+class GetEmissionsTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetEmissionsTool.Args>(
+    argsSerializer = Args.serializer(),
+    name = "GetEmissionsTool",
+    description = "Get the emission data for a country for a particular year."
+) {
     @Serializable
     data class Args(
         @property:LLMDescription("ISO country code list (e.g., 'USA', 'GBR', 'FRA')")
         val countryCodeList: List<String>,
         @property:LLMDescription("Year for which emissions occurred")
         val year: String
     )
-    override val argsSerializer = Args.serializer()
-    override val description = "Get the emission data for a country for a particular year."
 
-    override suspend fun doExecute(args: Args): String {
+    override suspend fun execute(args: Args): String {
         return climateTraceRepository.fetchCountryEmissionsInfo(args.countryCodeList, args.year).joinToString {
             it.emissions.co2.toString()
         }
     }
 }
 
 
-class GetAssetEmissionsTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetAssetEmissionsTool.Args>() {
+class GetAssetEmissionsTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetAssetEmissionsTool.Args>(
+    argsSerializer = Args.serializer(),
+    name = "GetAssetEmissionsTool",
+    description = "Get the asset emission data for a country."
+) {
     @Serializable
     data class Args(
         @property:LLMDescription("ISO country code list (e.g., 'USA', 'GBR', 'FRA')")
         val countryCodeList: List<String>,
     )
-    override val argsSerializer = Args.serializer()
-    override val description = "Get the asset emission data for a country."
 
-    override suspend fun doExecute(args: Args): String {
+    override suspend fun execute(args: Args): String {
         return climateTraceRepository.fetchCountryAssetEmissionsInfo(args.countryCodeList).toString()
     }
 }
 
-class GetPopulationTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetPopulationTool.Args>() {
+class GetPopulationTool(val climateTraceRepository: ClimateTraceRepository) : SimpleTool<GetPopulationTool.Args>(
+    argsSerializer = Args.serializer(),
+    name = "GetPopulationTool",
+    description = "Get population data for a country by its country code"
+) {
     @Serializable
-    data class Args(val countryCode: String)
-
-    override val argsSerializer = Args.serializer()
-    override val description = "Get population data for a country by its country code"
-
-    override val descriptor = ToolDescriptor(
-        name = "GetPopulationTool",
-        description = "Get population data for a country by its country code",
-        requiredParameters = listOf(
-            ToolParameterDescriptor(
-                name = "countryCode", description = "ISO country code (e.g., 'USA', 'GBR', 'FRA')", type = ToolParameterType.String
-            )
-        ),
+    data class Args(
+        @property:LLMDescription("ISO country code (e.g., 'USA', 'GBR', 'FRA')")
+        val countryCode: String
     )
 
-    override suspend fun doExecute(args: Args): String {
+    override suspend fun execute(args: Args): String {
         println("Getting population for ${args.countryCode}")
         try {
             val population = climateTraceRepository.getPopulation(args.countryCode)
@@ -112,19 +108,18 @@ class GetPopulationTool(val climateTraceRepository: ClimateTraceRepository) : Si
 class CurrentDatetimeTool(
     val defaultTimeZone: TimeZone = TimeZone.UTC,
     val clock: Clock = Clock.System,
-) : SimpleTool<CurrentDatetimeTool.Args>() {
+) : SimpleTool<CurrentDatetimeTool.Args>(
+    argsSerializer = Args.serializer(),
+    name = "current_datetime",
+    description = "Get the current date and time in the specified timezone"
+) {
     @Serializable
     data class Args(
         @property:LLMDescription("The timezone to get the current date and time in (e.g., 'UTC', 'America/New_York', 'Europe/London'). Defaults to UTC.")
         val timezone: String = "UTC"
     )
 
-    override val argsSerializer = Args.serializer()
-
-    override val name = "current_datetime"
-    override val description = "Get the current date and time in the specified timezone"
-
-    override suspend fun doExecute(args: Args): String {
+    override suspend fun execute(args: Args): String {
         val zoneId = try {
             TimeZone.of(args.timezone)
         } catch (_: Exception) {
diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ExitTool.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/agent/ExitTool.kt
@@ -4,16 +4,16 @@ import ai.koog.agents.core.tools.SimpleTool
 import ai.koog.agents.core.tools.annotations.LLMDescription
 import kotlinx.serialization.Serializable
 
-object ExitTool : SimpleTool<ExitTool.Args>() {
+object ExitTool : SimpleTool<ExitTool.Args>(
+    argsSerializer = Args.serializer(),
+    name = "ExitTool",
+    description = "Exit the agent session with the specified result. Call this tool to finish the conversation with the user."
+) {
     @Serializable
     data class Args(
         @property:LLMDescription("The result of the agent session. Default is empty, if there's no particular result.")
         val result: String = ""
     )
 
-    override val argsSerializer = Args.serializer()
-    override val description: String =
-        "Exit the agent session with the specified result. Call this tool to finish the conversation with the user."
-
-    override suspend fun doExecute(args: Args): String = args.result
+    override suspend fun execute(args: Args): String = args.result
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,36 +1,36 @@
 [versions]
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 ksp = "2.3.2"
 kotlinx-coroutines = "1.10.2"
 kotlinx-serialization = "1.9.0"
 kotlinx-dateTime = "0.7.1-0.6.x-compat"
 
-agp = "8.12.0"
+agp = "8.12.3"
 android-compileSdk = "36"
 android-minSdk = "24"
 android-targetSdk = "36"
-androidx-activityCompose = "1.12.1"
+androidx-activityCompose = "1.12.2"
 androidx-datastore = "1.2.0"
-compose = "1.10.0"
-compose-plugin = "1.9.3"
+compose = "1.10.1"
+compose-plugin = "1.10.0"
 composeAdaptiveLayout = "1.2.0"
 harawata-appdirs = "1.5.0"
-koalaplot = "0.10.1"
+koalaplot = "0.10.4"
 koin = "4.1.1"
 koin-compose-multiplatform = "4.1.1"
-kmpNativeCoroutines = "1.0.0-ALPHA-48"
-kmpObservableViewModel = "1.0.0-BETA-15"
+kmpNativeCoroutines = "1.0.0"
+kmpObservableViewModel = "1.0.1"
 kstore = "1.0.0"
 ktor = "3.3.3"
 treemapChart = "0.1.3"
 voyager= "1.1.0-beta03"
 molecule =  "2.2.0"
-mcp = "0.8.0"
-shadowPlugin = "9.2.2"
-jib = "3.5.1"
-googleAdk = "0.4.0"
-koogAgents = "0.5.4"
-markdownRenderer = "0.38.1"
+mcp = "0.8.1"
+shadowPlugin = "9.3.1"
+jib = "3.5.2"
+googleAdk = "0.5.0"
+koogAgents = "0.6.0"
+markdownRenderer = "0.39.1"
 buildkonfig = "0.17.1"
 
 
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -10,8 +10,8 @@
 		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
 		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
 		1A64543E2B45D93900204F96 /* KMMViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A64543D2B45D93900204F96 /* KMMViewModel.swift */; };
-		1AA509B02BEF5CAD0081137F /* KMPObservableViewModelCore in Frameworks */ = {isa = PBXBuildFile; productRef = 1AA509AF2BEF5CAD0081137F /* KMPObservableViewModelCore */; };
-		1AA509B22BEF5CAD0081137F /* KMPObservableViewModelSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 1AA509B12BEF5CAD0081137F /* KMPObservableViewModelSwiftUI */; };
+		1AEBF8A82F1A9F6D009F846D /* KMPObservableViewModelCore in Frameworks */ = {isa = PBXBuildFile; productRef = 1AEBF8A72F1A9F6D009F846D /* KMPObservableViewModelCore */; };
+		1AEBF8AA2F1A9F6D009F846D /* KMPObservableViewModelSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 1AEBF8A92F1A9F6D009F846D /* KMPObservableViewModelSwiftUI */; };
 		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
 		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
 /* End PBXBuildFile section */
@@ -32,8 +32,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1AA509B02BEF5CAD0081137F /* KMPObservableViewModelCore in Frameworks */,
-				1AA509B22BEF5CAD0081137F /* KMPObservableViewModelSwiftUI in Frameworks */,
+				1AEBF8A82F1A9F6D009F846D /* KMPObservableViewModelCore in Frameworks */,
+				1AEBF8AA2F1A9F6D009F846D /* KMPObservableViewModelSwiftUI in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -112,8 +112,8 @@
 			);
 			name = iosApp;
 			packageProductDependencies = (
-				1AA509AF2BEF5CAD0081137F /* KMPObservableViewModelCore */,
-				1AA509B12BEF5CAD0081137F /* KMPObservableViewModelSwiftUI */,
+				1AEBF8A72F1A9F6D009F846D /* KMPObservableViewModelCore */,
+				1AEBF8A92F1A9F6D009F846D /* KMPObservableViewModelSwiftUI */,
 			);
 			productName = iosApp;
 			productReference = 7555FF7B242A565900829871 /* ClimateTraceKMP.app */;
@@ -144,7 +144,7 @@
 			);
 			mainGroup = 7555FF72242A565900829871;
 			packageReferences = (
-				1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */,
+				1AEBF8A62F1A9F6D009F846D /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */,
 			);
 			productRefGroup = 7555FF7C242A565900829871 /* Products */;
 			projectDirPath = "";
@@ -406,25 +406,25 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */ = {
+		1AEBF8A62F1A9F6D009F846D /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/rickclephas/KMP-ObservableViewModel.git";
+			repositoryURL = "https://github.com/rickclephas/KMP-ObservableViewModel";
 			requirement = {
-				kind = exactVersion;
-				version = "1.0.0-BETA-1";
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.0.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		1AA509AF2BEF5CAD0081137F /* KMPObservableViewModelCore */ = {
+		1AEBF8A72F1A9F6D009F846D /* KMPObservableViewModelCore */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */;
+			package = 1AEBF8A62F1A9F6D009F846D /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */;
 			productName = KMPObservableViewModelCore;
 		};
-		1AA509B12BEF5CAD0081137F /* KMPObservableViewModelSwiftUI */ = {
+		1AEBF8A92F1A9F6D009F846D /* KMPObservableViewModelSwiftUI */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 1AA509AE2BEF5CAD0081137F /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */;
+			package = 1AEBF8A62F1A9F6D009F846D /* XCRemoteSwiftPackageReference "KMP-ObservableViewModel" */;
 			productName = KMPObservableViewModelSwiftUI;
 		};
 /* End XCSwiftPackageProductDependency section */
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iosApp/iosApp/KMMViewModel.swift b/iosApp/iosApp/KMMViewModel.swift
@@ -1,4 +1,6 @@
 import ComposeApp
 import KMPObservableViewModelCore
 
-extension Kmp_observableviewmodel_coreViewModel: ViewModel { }
+extension Kmp_observableviewmodel_coreViewModel: @retroactive ViewModel { }
+
+extension Kmp_observableviewmodel_coreViewModel: @retroactive Observable { }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)`
	`1`	`+![kotlin-version](https://img.shields.io/badge/kotlin-2.3.0-blue?logo=kotlin)`
`2`	`2`
`3`	`3`	`Kotlin/Compose Multiplatform project to show climate related emission data from https://climatetrace.org/data. Development just started so very much work in progress right now!`
`4`	`4`	`Have started with showing sector emission data per country but ton of other info available as well (ideas very welcome!).`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ class ClimateTraceAgentProvider(`
`122`	`122`	`) {`
`123`	`123`	`install(EventHandler) {`
`124`	`124`	`onToolCallStarting { ctx ->`
`125`		`- onToolCallEvent("Tool ${ctx.tool.name}, args ${ctx.toolArgs}")`
	`125`	`+ onToolCallEvent("Tool ${ctx.toolName}, args ${ctx.toolArgs}")`
`126`	`126`	`}`
`127`	`127`
`128`	`128`