azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Fix for output file

Browse Source
This commit is contained in:
Ilya Goncharov
2022-09-20 17:55:42 +02:00
committed by teamcity
parent b721b3e13c
commit 912066aadf
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+1 -1
View File
@@ -530,7 +530,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(protected val irBackend: Boolean)
":compileTestKotlin2Js" ":compileTestKotlin2Js"
) )
if (irBackend) { if (irBackend) {
assertFileInProjectExists("build/kotlin2js/main/module.js/default/manifest") assertFileInProjectExists("build/kotlin2js/main/default/manifest")
} else { } else {
assertFileInProjectExists("build/kotlin2js/main/module.js") assertFileInProjectExists("build/kotlin2js/main/module.js")
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsProjectWithTests/build.gradle
+3 -1
View File
@@ -28,10 +28,12 @@ artifacts {
implementation jarSources implementation jarSources
} }
compileKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/module.js"
compileTestKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/test/module-tests.js" compileTestKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/test/module-tests.js"
if (project.findProperty("kotlin.js.useIrBackend")?.toBoolean() == true) { if (project.findProperty("kotlin.js.useIrBackend")?.toBoolean() == true) {
compileKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-klib-dir", "-Xir-only"] compileKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-klib-dir", "-Xir-only"]
compileTestKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-js"] compileTestKotlin2Js.kotlinOptions.freeCompilerArgs += ["-Xir-produce-js"]
compileKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/"
} else {
compileKotlin2Js.kotlinOptions.outputFile = "${buildDir}/kotlin2js/main/module.js"
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/Kotlin2JsCompileConfig.kt
+2 -1
View File
@@ -57,7 +57,8 @@ internal open class BaseKotlin2JsCompileConfig<TASK : Kotlin2JsCompile>(
val freeArgs = task.enhancedFreeCompilerArgs.get() val freeArgs = task.enhancedFreeCompilerArgs.get()
if (task.compilerOptions.outputFile.orNull != null) { if (task.compilerOptions.outputFile.orNull != null) {
if (freeArgs.contains(PRODUCE_UNZIPPED_KLIB)) { if (freeArgs.contains(PRODUCE_UNZIPPED_KLIB)) {
File(task.compilerOptions.outputFile.get()) val file = File(task.compilerOptions.outputFile.get())
if (file.extension == "") file else file.parentFile
} else { } else {
File(task.compilerOptions.outputFile.get()).parentFile File(task.compilerOptions.outputFile.get()).parentFile
} }