Update template to Kotlin 2.3.0

bnorm · bnorm · commit ad146160e937 · 2025-10-17T08:05:27.000-05:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("multiplatform") version "2.2.20" apply false
-    kotlin("jvm") version "2.2.20" apply false
+    kotlin("multiplatform") version "2.3.0-Beta1" apply false
+    kotlin("jvm") version "2.3.0-Beta1" apply false
     id("com.github.gmazzo.buildconfig") version "5.6.5"
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false
 }
diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts
@@ -24,6 +24,7 @@ idea {
 }
 
 val annotationsRuntimeClasspath: Configuration by configurations.creating { isTransitive = false }
+val testArtifacts: Configuration by configurations.creating
 
 dependencies {
     compileOnly(kotlin("compiler"))
@@ -35,11 +36,12 @@ dependencies {
     annotationsRuntimeClasspath(project(":plugin-annotations"))
 
     // Dependencies required to run the internal test framework.
-    testRuntimeOnly("junit:junit:4.13.2")
-    testRuntimeOnly(kotlin("reflect"))
-    testRuntimeOnly(kotlin("test"))
-    testRuntimeOnly(kotlin("script-runtime"))
-    testRuntimeOnly(kotlin("annotations-jvm"))
+    testArtifacts(kotlin("stdlib"))
+    testArtifacts(kotlin("stdlib-jdk8"))
+    testArtifacts(kotlin("reflect"))
+    testArtifacts(kotlin("test"))
+    testArtifacts(kotlin("script-runtime"))
+    testArtifacts(kotlin("annotations-jvm"))
 }
 
 buildConfig {
@@ -95,10 +97,8 @@ tasks.compileTestKotlin {
 }
 
 fun Test.setLibraryProperty(propName: String, jarName: String) {
-    val path = project.configurations
-        .testRuntimeClasspath.get()
-        .files
-        .find { """$jarName-\d.*jar""".toRegex().matches(it.name) }
+    val path = testArtifacts.files
+        .find { """$jarName-\d.*""".toRegex().matches(it.name) }
         ?.absolutePath
         ?: return
     systemProperty(propName, path)
diff --git a/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleCommandLineProcessor.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimpleCommandLineProcessor.kt
@@ -7,9 +7,10 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 
 @Suppress("unused") // Used via reflection.
 class SimpleCommandLineProcessor : CommandLineProcessor {
-    override val pluginId: String = BuildConfig.KOTLIN_PLUGIN_ID
-
-    override val pluginOptions: Collection<CliOption> = emptyList()
+    override val pluginId: String
+        get() = BuildConfig.KOTLIN_PLUGIN_ID
+    override val pluginOptions: Collection<CliOption>
+        get() = emptyList()
 
     override fun processOption(option: AbstractCliOption, value: String, configuration: CompilerConfiguration) {
         error("Unexpected config option: '${option.optionName}'")
diff --git a/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginComponentRegistrar.kt b/compiler-plugin/src/org/jetbrains/kotlin/compiler/plugin/template/SimplePluginComponentRegistrar.kt
@@ -6,7 +6,9 @@ import org.jetbrains.kotlin.compiler.plugin.template.ir.SimpleIrGenerationExtens
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
 
-class SimplePluginComponentRegistrar: CompilerPluginRegistrar() {
+class SimplePluginComponentRegistrar : CompilerPluginRegistrar() {
+    override val pluginId: String
+        get() = BuildConfig.KOTLIN_PLUGIN_ID
     override val supportsK2: Boolean
         get() = true
 
diff --git a/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/GenerateTests.kt b/compiler-plugin/test-fixtures/org/jetbrains/kotlin/compiler/plugin/template/GenerateTests.kt
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.compiler.plugin.template
 
 import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJvmBoxTest
 import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJvmDiagnosticTest
-import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
+import org.jetbrains.kotlin.generators.dsl.junit5.generateTestGroupSuiteWithJUnit5
 
 fun main() {
     generateTestGroupSuiteWithJUnit5 {
diff --git a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmBoxTestGenerated.java
@@ -4,7 +4,6 @@
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TargetBackend;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Test;
 
@@ -18,7 +17,7 @@
 public class JvmBoxTestGenerated extends AbstractJvmBoxTest {
   @Test
   public void testAllFilesPresentInBox() {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, true);
   }
 
   @Test
diff --git a/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java b/compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JvmDiagnosticTestGenerated.java
@@ -4,7 +4,6 @@
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
-import org.jetbrains.kotlin.test.TargetBackend;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.jupiter.api.Test;
 
@@ -18,7 +17,7 @@
 public class JvmDiagnosticTestGenerated extends AbstractJvmDiagnosticTest {
   @Test
   public void testAllFilesPresentInDiagnostics() {
-    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true);
   }
 
   @Test
diff --git a/compiler-plugin/testData/box/anotherBoxTest.fir.ir.txt b/compiler-plugin/testData/box/anotherBoxTest.fir.ir.txt
@@ -33,7 +33,7 @@ FILE fqName:<root> fileName:/anotherBoxTest.kt
             then: STRING_CONCATENATION type=kotlin.String
               CONST String type=kotlin.String value="Fail: "
               GET_VAR 'val result: kotlin.Int declared in <root>.box' type=kotlin.Int origin=null
-FILE fqName:foo.bar fileName:__GENERATED DECLARATIONS__.kt
+FILE fqName:foo.bar fileName:foo/bar/MyClass.kt
   CLASS GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]
     thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name:<this> type:foo.bar.MyClass
     CONSTRUCTOR GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] visibility:public returnType:foo.bar.MyClass
diff --git a/compiler-plugin/testData/box/anotherBoxTest.fir.txt b/compiler-plugin/testData/box/anotherBoxTest.fir.txt
@@ -15,7 +15,7 @@ FILE: anotherBoxTest.kt
         }
 
     }
-FILE: __GENERATED DECLARATIONS__.kt
+FILE: foo/bar/MyClass.kt
     package foo.bar
 
     public final class MyClass : R|kotlin/Any| {
diff --git a/compiler-plugin/testData/box/simple.fir.ir.txt b/compiler-plugin/testData/box/simple.fir.ir.txt
@@ -18,7 +18,7 @@ FILE fqName:foo.bar fileName:/simple.kt
               STRING_CONCATENATION type=kotlin.String
                 CONST String type=kotlin.String value="Fail: "
                 GET_VAR 'val result: kotlin.String declared in foo.bar.box' type=kotlin.String origin=null
-FILE fqName:foo.bar fileName:__GENERATED DECLARATIONS__.kt
+FILE fqName:foo.bar fileName:foo/bar/MyClass.kt
   CLASS GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] CLASS name:MyClass modality:FINAL visibility:public superTypes:[kotlin.Any]
     thisReceiver: VALUE_PARAMETER INSTANCE_RECEIVER kind:DispatchReceiver name:<this> type:foo.bar.MyClass
     CONSTRUCTOR GENERATED[org.jetbrains.kotlin.compiler.plugin.template.fir.SimpleClassGenerator.Key] visibility:public returnType:foo.bar.MyClass
diff --git a/compiler-plugin/testData/box/simple.fir.txt b/compiler-plugin/testData/box/simple.fir.txt
@@ -13,7 +13,7 @@ FILE: simple.kt
         }
 
     }
-FILE: __GENERATED DECLARATIONS__.kt
+FILE: foo/bar/MyClass.kt
     package foo.bar
 
     public final class MyClass : R|kotlin/Any| {
diff --git a/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.fir.txt b/compiler-plugin/testData/diagnostics/anotherDiagnosticTest.fir.txt
@@ -7,7 +7,7 @@ FILE: foo.kt
     public final fun test(): R|kotlin/Unit| {
         R|foo/takeInt|(Int(10))
     }
-FILE: __GENERATED DECLARATIONS__.kt
+FILE: foo/bar/MyClass.kt
     package foo.bar
 
     public final class MyClass : R|kotlin/Any| {
@@ -24,7 +24,7 @@ FILE: bar.kt
         R|foo/takeInt|(Int(10))
         R|foo/takeInt<Inapplicable(INAPPLICABLE): foo/takeInt>#|(String(Hello))
     }
-FILE: __GENERATED DECLARATIONS__.kt
+FILE: foo/bar/MyClass.kt
     package foo.bar
 
     public final class MyClass : R|kotlin/Any| {
diff --git a/compiler-plugin/testData/diagnostics/simple.fir.txt b/compiler-plugin/testData/diagnostics/simple.fir.txt
@@ -5,7 +5,7 @@ FILE: simple.kt
         lval s: R|kotlin/String| = R|foo/bar/MyClass|().R|foo/bar/MyClass.foo|()
         R|<local>/s|.<Unresolved name: inc>#()
     }
-FILE: __GENERATED DECLARATIONS__.kt
+FILE: foo/bar/MyClass.kt
     package foo.bar
 
     public final class MyClass : R|kotlin/Any| {
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
@@ -249,10 +249,10 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-kotlin-web-helpers@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
-  integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==
+kotlin-web-helpers@3.0.0:
+  version "3.0.0"
+  resolved "https://packages.jetbrains.team/npm/p/crl/build-deps/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz#3ed6b48f694f74bb60a737a9d7e2c0e3b29abdb9"
+  integrity sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw==
   dependencies:
     format-util "^1.0.5"
 
@@ -288,10 +288,10 @@ minimatch@^9.0.4, minimatch@^9.0.5:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-mocha@11.7.1:
-  version "11.7.1"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
-  integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==
+mocha@11.7.2:
+  version "11.7.2"
+  resolved "https://packages.jetbrains.team/npm/p/crl/build-deps/mocha/-/mocha-11.7.2.tgz#3c0079fe5cc2f8ea86d99124debcc42bb1ab22b5"
+  integrity sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==
   dependencies:
     browser-stdout "^1.3.1"
     chokidar "^4.0.1"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`		`- kotlin("multiplatform") version "2.2.20" apply false`
`3`		`- kotlin("jvm") version "2.2.20" apply false`
	`2`	`+ kotlin("multiplatform") version "2.3.0-Beta1" apply false`
	`3`	`+ kotlin("jvm") version "2.3.0-Beta1" apply false`
`4`	`4`	`id("com.github.gmazzo.buildconfig") version "5.6.5"`
`5`	`5`	`id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ FILE: anotherBoxTest.kt`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`}`
`18`		`-FILE: __GENERATED DECLARATIONS__.kt`
	`18`	`+FILE: foo/bar/MyClass.kt`
`19`	`19`	`package foo.bar`
`20`	`20`
`21`	`21`	`public final class MyClass : R\|kotlin/Any\| {`