Bump to Kotlin 2.3.0

Author: deusaquilus

build-logic/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.20")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0")
   implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
   implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
 

build-logic/src/main/kotlin/conventions-multiplatform.gradle.kts

@@ -1,6 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {

build-logic/src/main/kotlin/conventions.gradle.kts

@@ -18,7 +18,7 @@ repositories {
 
 group = "io.exoquery"
 // Everything inherits the version from here
-version = "2.2.20-2.0.1.PL"
+version = "2.3.0-2.0.1.PL"
 
 object Versions {
     val decomatVersion = "0.3.0"

build-logic/src/main/kotlin/publish-jvm.gradle.kts

@@ -21,8 +21,10 @@ repositories {
 
 tasks {
   compileKotlin {
-    kotlinOptions.suppressWarnings = true
-    kotlinOptions.jvmTarget = "11"
+    compilerOptions {
+      suppressWarnings.set(true)
+      jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    }
   }
 
   compileJava {
@@ -31,7 +33,9 @@ tasks {
   }
 
   compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
+    compilerOptions {
+      jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+    }
   }
 
   compileTestJava {

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  kotlin("multiplatform") version "2.2.20" apply false
+  kotlin("multiplatform") version "2.3.0" apply false
   id("io.github.gradle-nexus.publish-plugin") version "1.1.0" apply false
 }
 

terpal-plugin-gradle/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm") version "2.2.20"
+    kotlin("jvm") version "2.3.0"
 
     // No inclusion of `publish` here because this project is not published to maven directly
     id("maven-publish")

terpal-plugin-kotlin/build.gradle.kts

@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-    kotlin("jvm") version "2.2.20"
+    kotlin("jvm") version "2.3.0"
     id("maven-publish")
     id("conventions")
     id("publish-jvm")
-    kotlin("kapt") version "2.2.20"
+    kotlin("kapt") version "2.3.0"
 }
 
 kotlin {

terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/Registrar.kt

@@ -6,21 +6,24 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
+import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import kotlin.io.path.Path
 
 @AutoService(CompilerPluginRegistrar::class)
 @OptIn(ExperimentalCompilerApi::class)
-class Registrar: CompilerPluginRegistrar() {
+class Registrar : CompilerPluginRegistrar() {
     override val supportsK2: Boolean get() = true
 
+    override val pluginId: String = "io.exoquery.terpal-plugin"
+
     override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
         IrGenerationExtension.registerExtension(
             GenerationExtension(
               // Need to initialize the config here because later the options info inside the config will be
               // erased. I am not sure why kotlin does this.
               Options(configuration),
               configuration,
-              configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY),
+              configuration.getNotNull(CommonConfigurationKeys.MESSAGE_COLLECTOR_KEY),
               Path(configuration.getNotNull(PROJECT_DIR_KEY))
             )
         )

terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/transform/BuilderExtensions.kt

@@ -118,7 +118,7 @@ context(bc: BuilderContext) fun createLambdaN(functionBody: IrExpression, params
 
     val typeWith = params.map { it.type } + functionClosure.returnType
     val functionType =
-      bc.pluginCtx.symbols.functionN(params.size)
+      bc.pluginCtx.irBuiltIns.functionN(params.size)
         // Remember this is FunctionN<InputA, InputB, ... Output> so these input/output args need to be both specified here
         .typeWith(typeWith)
 

terpal-plugin-kotlin/src/main/kotlin/io/exoquery/terpal/plugin/transform/TransformInterepolatorBatchingInvoke.kt

@@ -114,7 +114,7 @@ class TransformInterepolatorBatchingInvoke(val ctx: BuilderContext) {
 
       val lifter = makeLifter()
       val partsLifted =
-        with (lifter) { parts.liftExprTyped(context.symbols.string.defaultType) }
+        with (lifter) { parts.liftExprTyped(context.irBuiltIns.stringType) }
 
 
       // TODO what if it's an interpolator in an interpolator (i.e. Sql("...${Sql(...)}...") ) so need to call recursive transform