diff options
| author | Ilya Goncharov <ilya.goncharov@jetbrains.com> | 2022-03-22 16:41:52 +0300 |
|---|---|---|
| committer | mvicsokolova <maria.sokolova@jetbrains.com> | 2022-03-23 11:23:02 +0300 |
| commit | 3dfc7d69ee34e65e67e6d36538aade71dc9a9cb7 (patch) | |
| tree | ba04d66db5283117817aac3bd44689bbc64ea7d9 | |
| parent | 0cf0811b9316fa6edf1c7b30ad723eccd226bb15 (diff) | |
| download | kotlinx.atomicfu-3dfc7d69ee34e65e67e6d36538aade71dc9a9cb7.tar.gz | |
Use module-name for file names and transformed file as input file property
| -rw-r--r-- | atomicfu/build.gradle | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/atomicfu/build.gradle b/atomicfu/build.gradle index c44d969..cfee622 100644 --- a/atomicfu/build.gradle +++ b/atomicfu/build.gradle @@ -24,6 +24,7 @@ kotlin { // JS -- always js { + moduleName = "kotlinx-atomicfu" // TODO: Commented out because browser tests do not work on TeamCity // browser() nodejs() @@ -164,14 +165,6 @@ tasks.withType(compileJsLegacy.getClass()) { } } -compileJsLegacy.configure { - kotlinOptions { - // NOTE: Module base-name must be equal to the package name declared in package.json - def baseName = "kotlinx-atomicfu" - outputFile = new File(new File(outputFile).parent, baseName + ".js") - } -} - apply from: file("$rootProject.projectDir/gradle/node-js.gradle") apply from: file("$rootProject.projectDir/gradle/publish-npm-js.gradle") @@ -208,8 +201,14 @@ task transformJS(type: JavaExec, dependsOn: [compileTestJsLegacy]) { if (project.tasks.findByName('jsLegacyNodeTest')) { jsLegacyNodeTest.dependsOn transformJS + jsLegacyNodeTest.configure { + inputFileProperty.set(new File(transformedJsFile)) + } } else { jsNodeTest.dependsOn transformJS + jsNodeTest.configure { + inputFileProperty.set(new File(transformedJsFile)) + } } // ==== CONFIGURE JVM ===== |