From a5f34efc91080f2106c7b7dd9b1c00382b78cf04 Mon Sep 17 00:00:00 2001
From: Phil Davies <git@karn.co.uk>
Date: Wed, 3 Jun 2026 18:19:16 +0100
Subject: [PATCH] Bump to Kotlin 2.4.0

---
 build-logic/src/main/kotlin/conventions.gradle.kts           | 2 +-
 build.gradle.kts                                             | 2 +-
 terpal-plugin-gradle/build.gradle.kts                        | 2 +-
 terpal-plugin-kotlin/build.gradle.kts                        | 5 ++---
 .../io/exoquery/terpal/plugin/logging/CompileLogger.kt       | 3 ++-
 terpal-runtime/build.gradle.kts                              | 2 +-
 testing/build.gradle.kts                                     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build-logic/src/main/kotlin/conventions.gradle.kts b/build-logic/src/main/kotlin/conventions.gradle.kts
index 4ce8ec2..ecec977 100644
--- a/build-logic/src/main/kotlin/conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/conventions.gradle.kts
@@ -18,7 +18,7 @@ repositories {
 
 group = "io.exoquery"
 // Everything inherits the version from here
-version = "2.3.0-2.0.1.PL"
+version = "2.4.0-2.0.1.PL"
 
 object Versions {
     val decomatVersion = "0.3.0"
diff --git a/build.gradle.kts b/build.gradle.kts
index a7d3d64..c95c5f9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  kotlin("multiplatform") version "2.3.0" apply false
+  kotlin("multiplatform") version "2.4.0" apply false
   id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply false
 }
 
diff --git a/terpal-plugin-gradle/build.gradle.kts b/terpal-plugin-gradle/build.gradle.kts
index cb5f93c..1e8013f 100644
--- a/terpal-plugin-gradle/build.gradle.kts
+++ b/terpal-plugin-gradle/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "2.3.0"
+    kotlin("jvm") version "2.4.0"
 
     // No inclusion of `publish` here because this project is not published to maven directly
     id("maven-publish")
diff --git a/terpal-plugin-kotlin/build.gradle.kts b/terpal-plugin-kotlin/build.gradle.kts
index 46ba1b0..47e4622 100644
--- a/terpal-plugin-kotlin/build.gradle.kts
+++ b/terpal-plugin-kotlin/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("jvm") version "2.3.0"
+    kotlin("jvm") version "2.4.0"
     id("maven-publish")
     id("conventions")
     id("publish-jvm")
-    kotlin("kapt") version "2.3.0"
+    kotlin("kapt") version "2.4.0"
 }
 
 kotlin {
@@ -14,7 +14,6 @@ kotlin {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile>().configureEach {
     compilerOptions {
-        freeCompilerArgs.add("-Xcontext-parameters")
         // Otherwise will have: Could not resolve io.exoquery:pprint-kotlin:2.0.1.
         // Incompatible because this component declares a component, compatible with Java 11 and the consumer needed a component, compatible with Java 8
         java {
diff --git a/terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/logging/CompileLogger.kt b/terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/logging/CompileLogger.kt
index ab6fecf..896a52c 100644
--- a/terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/logging/CompileLogger.kt
+++ b/terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/logging/CompileLogger.kt
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocationWithRange
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
+import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrFile
@@ -24,7 +25,7 @@ data class CompileLogger(val messageCollector: MessageCollector, val currentFile
 
   companion object {
     operator fun invoke(config: CompilerConfiguration, currentFile: IrFile, macroCallSite: IrElement) =
-      config.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE).let {
+      config.get(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE).let {
         CompileLogger(it, currentFile, macroCallSite)
       }
   }
diff --git a/terpal-runtime/build.gradle.kts b/terpal-runtime/build.gradle.kts
index 42e0420..a539aa9 100644
--- a/terpal-runtime/build.gradle.kts
+++ b/terpal-runtime/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
-  kotlin("multiplatform") version "2.3.0"
+  kotlin("multiplatform") version "2.4.0"
 
   id("maven-publish")
   id("conventions-multiplatform")
diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts
index ce48722..195a3dc 100644
--- a/testing/build.gradle.kts
+++ b/testing/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("io.exoquery.terpal-plugin")
     id("conventions-multiplatform")
-    kotlin("multiplatform") version "2.3.0"
+    kotlin("multiplatform") version "2.4.0"
 }
 
 kotlin {