diff --git a/README.md b/README.md index c2fa8318..4f00987c 100644 --- a/README.md +++ b/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.8.21` Because the internal APIs of the Kotlin compiler often change between versions, we can only support one `kotlin-compiler-embeddable` version at a time. diff --git a/build.gradle b/build.gradle index d1699357..3bf8c094 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.8.0' - ext.embedded_kotlin_version = '1.8.0' + ext.kotlin_version = '1.8.21' + ext.embedded_kotlin_version = '1.8.21' repositories { mavenCentral() diff --git a/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt b/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt index b79dd312..172fb7df 100644 --- a/core/src/main/kotlin/com/tschuchort/compiletesting/KotlinJsCompilation.kt +++ b/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() { @@ -79,7 +81,8 @@ class KotlinJsCompilation : AbstractKotlinCompilation() { args.noStdlib = true args.moduleKind = "commonjs" - args.outputFile = File(outputDir, outputFileName).absolutePath + args.outputDir = outputDir.absolutePath // -ir-output-dir + args.moduleName = Paths.get(outputFileName).nameWithoutExtension // -ir-output-name args.sourceMapBaseDirs = jsClasspath().joinToString(separator = File.pathSeparator) args.libraries = listOfNotNull(kotlinStdLibJsJar).joinToString(separator = ":") diff --git a/ksp/build.gradle b/ksp/build.gradle index 49fd1a3e..0e388cfb 100644 --- a/ksp/build.gradle +++ b/ksp/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.ksp_version = '1.8.0-1.0.8' + ext.ksp_version = '1.8.21-1.0.11' } dependencies {