Skip to content

Commit 78186ae

Browse files
Abduqodiri Qurbonzodaqurbonzoda
authored andcommitted
Favor js instead of jsLegacy moniker
1 parent 7ca928c commit 78186ae

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

examples/kotlin-multiplatform/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ allOpen {
1212
kotlin {
1313
jvm()
1414
js('jsIr', IR) { nodejs() }
15-
js('jsLegacy', LEGACY) { nodejs() }
15+
js { nodejs() }
1616
macosX64 {}
1717
macosArm64 {}
1818
linuxX64 {}
@@ -34,10 +34,7 @@ kotlin {
3434
jvmMain {}
3535

3636
jsMain {
37-
dependsOn(commonMain)
38-
3937
jsIrMain.dependsOn(it)
40-
jsLegacyMain.dependsOn(it)
4138
}
4239

4340
nativeMain {
@@ -105,7 +102,7 @@ benchmark {
105102
jmhVersion = "1.21"
106103
}
107104
register("jsIr")
108-
register("jsLegacy")
105+
register("js")
109106
register("macosX64")
110107
register("macosArm64")
111108
register("linuxX64")

integration/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ val createClasspathManifest by tasks.registering {
6666
resolve("runtime-metadata.txt").writeText(artifactsTask("metadata").archiveFilePath)
6767
resolve("runtime-jvm.txt").writeText(artifactsTask("jvm").archiveFilePath)
6868
resolve("runtime-jsIr.txt").writeText(artifactsTask("jsIr").archiveFilePath)
69-
resolve("runtime-jsLegacy.txt").writeText(artifactsTask("jsLegacy").archiveFilePath)
69+
resolve("runtime-js.txt").writeText(artifactsTask("jsLegacy").archiveFilePath)
7070
resolve("runtime-native.txt").writeText(artifactsTaskNativeKlibs().klibs())
7171
}
7272
}

integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private val buildScript = run {
4242
def benchmarkRuntimeMetadata = files(${readFileList("runtime-metadata.txt")})
4343
def benchmarkRuntimeJvm = files(${readFileList("runtime-jvm.txt")})
4444
def benchmarkRuntimeJsIr = files(${readFileList("runtime-jsIr.txt")})
45-
def benchmarkRuntimeJsLegacy = files(${readFileList("runtime-jsLegacy.txt")})
45+
def benchmarkRuntimeJs = files(${readFileList("runtime-js.txt")})
4646
def benchmarkRuntimeNative = files(${readFileList("runtime-native.txt")})
4747
""".trimIndent()
4848
}

integration/src/test/kotlin/kotlinx/benchmark/integration/ReportFormatTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class ReportFormatTest : GradleTest() {
88
@Test
99
fun testReportFormatFileNames() {
1010
val formats = listOf(null, "json", "csv", "scsv", "text")
11-
val targets = listOf("jsIr", "jsLegacy", "jvm", "native")
11+
val targets = listOf("jsIr", "js", "jvm", "native")
1212

1313
val runner = project("kotlin-multiplatform", true) {
1414
formats.forEach { format ->

integration/src/test/resources/templates/kotlin-multiplatform/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.konan.target.HostManager
44
kotlin {
55
jvm()
66
js('jsIr', IR) { nodejs() }
7-
js('jsLegacy', LEGACY) { nodejs() }
7+
js { nodejs() }
88

99
if (HostManager.hostIsLinux) linuxX64('native')
1010
if (HostManager.hostIsMingw) mingwX64('native')
@@ -27,9 +27,9 @@ kotlin {
2727
implementation(benchmarkRuntimeJsIr)
2828
}
2929
}
30-
jsLegacyMain {
30+
jsMain {
3131
dependencies {
32-
implementation(benchmarkRuntimeJsLegacy)
32+
implementation(benchmarkRuntimeJs)
3333
}
3434
}
3535
nativeMain {
@@ -45,7 +45,7 @@ benchmark {
4545
targets {
4646
register("jvm")
4747
register("jsIr")
48-
register("jsLegacy")
48+
register("js")
4949
register("native")
5050
}
5151
}

0 commit comments

Comments
 (0)