Skip to content

Commit 95c4ed3

Browse files
committed
Kotlin 1.9.10
1 parent 82ec542 commit 95c4ed3

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
2-
ext.kotlin_version = '1.8.0'
3-
ext.embedded_kotlin_version = '1.8.0'
2+
ext.kotlin_version = '1.9.10'
3+
ext.embedded_kotlin_version = '1.9.10'
44

55
repositories {
66
mavenCentral()

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package com.tschuchort.compiletesting
33
import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
44
import org.jetbrains.kotlin.cli.js.K2JSCompiler
55
import java.io.*
6+
import java.nio.file.Paths
7+
import kotlin.io.path.nameWithoutExtension
68

79
@Suppress("MemberVisibilityCanBePrivate")
810
class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
@@ -79,7 +81,8 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
7981
args.noStdlib = true
8082

8183
args.moduleKind = "commonjs"
82-
args.outputFile = File(outputDir, outputFileName).absolutePath
84+
args.outputDir = outputDir.absolutePath // -ir-output-dir
85+
args.moduleName = Paths.get(outputFileName).nameWithoutExtension // -ir-output-name
8386
args.sourceMapBaseDirs = jsClasspath().joinToString(separator = File.pathSeparator)
8487
args.libraries = listOfNotNull(kotlinStdLibJsJar).joinToString(separator = ":")
8588

@@ -91,7 +94,7 @@ class KotlinJsCompilation : AbstractKotlinCompilation<K2JSCompilerArguments>() {
9194
args.irOnly = irOnly
9295
args.irModuleName = irModuleName
9396
args.generateDts = generateDts
94-
args.useDeprecatedLegacyCompiler = useDeprecatedLegacyCompiler
97+
args.forceDeprecatedLegacyCompilerUsage = useDeprecatedLegacyCompiler
9598
}
9699

97100
/** Runs the compilation task */

ksp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.ksp_version = '1.8.0-1.0.8'
2+
ext.ksp_version = '1.9.10-1.0.13'
33
}
44

55
dependencies {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.com.intellij.psi.PsiTreeChangeAdapter
2020
import org.jetbrains.kotlin.com.intellij.psi.PsiTreeChangeListener
2121
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
2222
import org.jetbrains.kotlin.config.CompilerConfiguration
23+
import org.jetbrains.kotlin.config.languageVersionSettings
2324
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
2425
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
2526
import java.io.File
@@ -193,6 +194,7 @@ private class KspCompileTestingComponentRegistrar(
193194
it.deleteRecursively()
194195
it.mkdirs()
195196
}
197+
this.languageVersionSettings = configuration.languageVersionSettings
196198
configuration[CLIConfigurationKeys.CONTENT_ROOTS]
197199
?.filterIsInstance<JavaSourceRoot>()
198200
?.forEach {

0 commit comments

Comments
 (0)