From 4eedfe7f58302b17127f56884f07c28629fee616 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 12 Sep 2022 17:51:22 +0200 Subject: [PATCH] [Gradle, JS] Fix compilation after rebase --- .../cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt | 2 +- .../org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt | 0 .../kotlin/gradle/internal/CompilerArgumentsGradleInput.kt | 0 .../org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt create mode 100644 libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsGradleInput.kt diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt index 2aca67707fd..ad1f4c59d37 100644 --- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt +++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt @@ -459,7 +459,7 @@ class K2JsIrCompiler : CLICompiler() { outputs.write(outputDir, outputName) if (arguments.generateDts) { - val dtsFile = outputFile.withReplacedExtensionOrNull(outputFile.extension, "d.ts")!! + val dtsFile = outputDir.resolve("$outputName.d.ts") dtsFile.writeText(tsDefinitions) } } catch (e: CompilationException) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptionsImpl.kt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsGradleInput.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/CompilerArgumentsGradleInput.kt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt index 7479fcc569a..d1c7941d775 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrLink.kt @@ -10,6 +10,7 @@ import org.gradle.api.file.FileCollection import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property import org.gradle.api.tasks.* +import org.gradle.work.NormalizeLineEndings import org.gradle.workers.WorkerExecutor import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments