Support Kotlin 1.9.0

README.md

@@ -110,7 +110,7 @@ Kotlin-Compile-Testing is compatible with all _local_ compiler versions. It does
 However, if your project or any of its dependencies depend directly on compiler artifacts such as `kotlin-compiler-embeddable` or `kotlin-annotation-processing-embeddable` then they have to be the same version as the one used by Kotlin-Compile-Testing or there will be a transitive dependency conflict.
 
 
-- Current `kotlin-compiler-embeddable` version: `1.8.0`
+- Current `kotlin-compiler-embeddable` version: `1.9.10`
 
 Because the internal APIs of the Kotlin compiler often change between versions, we can only support one `kotlin-compiler-embeddable` version at a time. 
 

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
-    ext.kotlin_version = '1.8.0'
-    ext.embedded_kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.9.10'
+    ext.embedded_kotlin_version = '1.9.10'
 
     repositories {
         mavenCentral()

core/src/main/kotlin/com/tschuchort/compiletesting/AbstractKotlinCompilation.kt

@@ -36,8 +36,9 @@ abstract class AbstractKotlinCompilation<A : CommonCompilerArguments> internal c
     /** Working directory for the compilation */
     var workingDir: File by default {
         val path = Files.createTempDirectory("Kotlin-Compilation")
-        log("Created temporary working directory at ${path.toAbsolutePath()}")
-        return@default path.toFile()
+        val canonicalFile = path.toFile().canonicalFile
+        log("Created temporary working directory at ${canonicalFile.canonicalPath}")
+        return@default canonicalFile
     }
 
     /**

core/src/main/kotlin/com/tschuchort/compiletesting/KotlinCompilation.kt

@@ -71,6 +71,7 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 	var javaParameters: Boolean = false
 
 	/** Use the IR backend */
+	@Deprecated("Since Kotlin 1.9.20 this option is no longer supported by the compiler. It has no effect.")
 	var useIR: Boolean = false
 
 	/** Use the old JVM backend */
@@ -304,7 +305,6 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 
 		args.jvmTarget = jvmTarget
 		args.javaParameters = javaParameters
-		args.useIR = useIR
 		args.useOldBackend = useOldBackend
 
 		if(javaModulePath != null)

core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt

@@ -3,6 +3,8 @@ package com.tschuchort.compiletesting
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
 import org.jetbrains.kotlin.cli.js.K2JSCompiler
 import java.io.*
+import java.nio.file.Paths
+import kotlin.io.path.nameWithoutExtension
 
 @Suppress("MemberVisibilityCanBePrivate")
 class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
@@ -79,6 +81,8 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
     args.noStdlib = true
 
     args.moduleKind = "commonjs"
+    args.outputDir = outputDir.absolutePath // -ir-output-dir
+    args.moduleName = Paths.get(outputFileName).nameWithoutExtension  // -ir-output-name
     args.outputFile = File(outputDir, outputFileName).absolutePath
     args.sourceMapBaseDirs = jsClasspath().joinToString(separator = File.pathSeparator)
     args.libraries = listOfNotNull(kotlinStdLibJsJar).joinToString(separator = ":")
@@ -91,7 +95,7 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
     args.irOnly = irOnly
     args.irModuleName = irModuleName
     args.generateDts = generateDts
-    args.useDeprecatedLegacyCompiler = useDeprecatedLegacyCompiler
+    args.forceDeprecatedLegacyCompilerUsage = useDeprecatedLegacyCompiler
   }
 
   /** Runs the compilation task */

core/src/test/kotlin/com/tschuchort/compiletesting/KotlinJsCompilationTests.kt

@@ -78,27 +78,6 @@ class KotlinJsCompilationTests {
 		assertThat(jsFile.readText()).contains("function KSource_0() {")
 	}
 
-	@Test
-	fun `Kotlin can access browser window`() {
-		val source = SourceFile.kotlin("kSource.kt", """
-import kotlinx.browser.window
-
-fun main(addKotlincArgs: Array<String>) {
-    println(window.document)
-}
-""")
-
-		val result = defaultJsCompilerConfig().apply {
-			sources = listOf(source)
-		}.compile()
-
-		assertThat(result.exitCode).isEqualTo(ExitCode.OK)
-		assertThat(result.compiledClassAndResourceFiles).hasSize(1)
-		val jsFile = result.compiledClassAndResourceFiles[0]
-		println(jsFile.readText())
-		assertThat(jsFile.readText()).contains("println(window.document);")
-	}
-
 	@Test
 	fun `detects the plugin provided for compilation via pluginClasspaths property`() {
 		val result = defaultJsCompilerConfig().apply {

ksp/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.ksp_version = '1.8.0-1.0.8'
+    ext.ksp_version = '1.9.10-1.0.13'
 }
 
 dependencies {

ksp/src/main/kotlin/com/tschuchort/compiletesting/Ksp.kt

@@ -19,7 +19,10 @@ import org.jetbrains.kotlin.com.intellij.mock.MockProject
 import org.jetbrains.kotlin.com.intellij.psi.PsiTreeChangeAdapter
 import org.jetbrains.kotlin.com.intellij.psi.PsiTreeChangeListener
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
+import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import java.io.File
@@ -169,6 +172,9 @@ private class KspCompileTestingComponentRegistrar(
             this.allWarningsAsErrors = this@KspCompileTestingComponentRegistrar.allWarningsAsErrors
             this.withCompilation = this@KspCompileTestingComponentRegistrar.withCompilation
 
+            this.languageVersionSettings =
+                LanguageVersionSettingsImpl(LanguageVersion.KOTLIN_1_9, ApiVersion.KOTLIN_1_9)
+
             this.cachesDir = compilation.kspCachesDir.also {
                 it.deleteRecursively()
                 it.mkdirs()
@@ -216,7 +222,11 @@ private class KspCompileTestingComponentRegistrar(
         val registrar = KspTestExtension(options, providers, messageCollectorBasedKSPLogger)
         AnalysisHandlerExtension.registerExtension(project, registrar)
         // Dummy extension point; Required by dropPsiCaches().
-        CoreApplicationEnvironment.registerExtensionPoint(project.extensionArea, PsiTreeChangeListener.EP.name, PsiTreeChangeAdapter::class.java)
+        CoreApplicationEnvironment.registerExtensionPoint(
+            project.extensionArea,
+            PsiTreeChangeListener.EP.name,
+            PsiTreeChangeAdapter::class.java
+        )
     }
 }