Skip to content

Commit e65c159

Browse files
Abduqodiri Qurbonzodaqurbonzoda
authored andcommitted
Remove JS legacy target
1 parent 54c01d6 commit e65c159

File tree

8 files changed

+6
-16
lines changed

8 files changed

+6
-16
lines changed

examples/kotlin-multiplatform/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ allOpen {
1616
kotlin {
1717
jvm()
1818
js('jsIr', IR) { nodejs() }
19-
js { nodejs() }
2019
js('jsIrBuiltIn', IR) { nodejs() }
2120
wasm { d8() }
2221
if (HostManager.host == KonanTarget.MACOS_X64.INSTANCE) macosX64('native')
@@ -43,6 +42,7 @@ kotlin {
4342

4443
jsMain {
4544
jsIrMain.dependsOn(it)
45+
jsIrBuiltInMain.dependsOn(it)
4646
}
4747

4848
nativeMain {
@@ -106,7 +106,6 @@ benchmark {
106106
jmhVersion = "1.21"
107107
}
108108
register("jsIr")
109-
register("js")
110109
register("jsIrBuiltIn") {
111110
jsBenchmarksExecutor = JsBenchmarksExecutor.BuiltIn
112111
}

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ version=0.4.7
44
kotlin_version=1.7.20
55
jmhVersion=1.21
66
infra_version=0.3.0-dev-73
7-
kotlin.js.compiler=ir
87
kotlin.code.style=official
98
kotlin.incremental.multiplatform=true
109
kotlin.mpp.enableGranularSourceSetsMetadata=true

integration/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ val createClasspathManifest by tasks.registering {
5353
dependsOn(plugin.task(":createClasspathManifest"))
5454
dependsOn(artifactsTask("jvm"))
5555
dependsOn(artifactsTask("jsIr"))
56-
dependsOn(artifactsTask("jsLegacy"))
5756
dependsOn(artifactsTask("wasm"))
5857
dependsOn(artifactsTask("metadata"))
5958
dependsOn(artifactsTaskNativeKlibs())
@@ -67,7 +66,6 @@ val createClasspathManifest by tasks.registering {
6766
resolve("runtime-metadata.txt").writeText(artifactsTask("metadata").archiveFilePath)
6867
resolve("runtime-jvm.txt").writeText(artifactsTask("jvm").archiveFilePath)
6968
resolve("runtime-jsIr.txt").writeText(artifactsTask("jsIr").archiveFilePath)
70-
resolve("runtime-js.txt").writeText(artifactsTask("jsLegacy").archiveFilePath)
7169
resolve("runtime-wasm.txt").writeText(artifactsTask("wasm").archiveFilePath)
7270
resolve("runtime-native.txt").writeText(artifactsTaskNativeKlibs().klibs())
7371
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ private val buildScript = run {
4343
def benchmarkRuntimeMetadata = files(${readFileList("runtime-metadata.txt")})
4444
def benchmarkRuntimeJvm = files(${readFileList("runtime-jvm.txt")})
4545
def benchmarkRuntimeJsIr = files(${readFileList("runtime-jsIr.txt")})
46-
def benchmarkRuntimeJs = files(${readFileList("runtime-js.txt")})
4746
def benchmarkRuntimeWasm = files(${readFileList("runtime-wasm.txt")})
4847
def benchmarkRuntimeNative = files(${readFileList("runtime-native.txt")})
4948
""".trimIndent()

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", "js", "wasm", "jvm", "native")
11+
val targets = listOf("jsIr", "wasm", "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: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import org.jetbrains.kotlin.konan.target.HostManager
44
kotlin {
55
jvm()
66
js('jsIr', IR) { nodejs() }
7-
js { nodejs() }
87
wasm { d8() }
98

109
if (HostManager.hostIsLinux) linuxX64('native')
@@ -28,11 +27,6 @@ kotlin {
2827
implementation(benchmarkRuntimeJsIr)
2928
}
3029
}
31-
jsMain {
32-
dependencies {
33-
implementation(benchmarkRuntimeJs)
34-
}
35-
}
3630
wasmMain {
3731
dependencies {
3832
implementation(benchmarkRuntimeWasm)
@@ -58,7 +52,6 @@ benchmark {
5852
targets {
5953
register("jvm")
6054
register("jsIr")
61-
register("js")
6255
register("wasm")
6356
register("native")
6457
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
kotlin.js.compiler=ir
21
org.gradle.jvmargs=-Xmx2g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

runtime/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ kotlin {
3030
}
3131

3232
jvm()
33-
js(BOTH) { nodejs() }
33+
js("jsIr", IR) { nodejs() }
3434
wasm { d8() }
3535

3636
sourceSets.all {
@@ -57,6 +57,9 @@ kotlin {
5757
implementation "org.openjdk.jmh:jmh-core:$jmhVersion"
5858
}
5959
}
60+
jsMain {
61+
jsIrMain.dependsOn(it)
62+
}
6063
nativeMain {
6164
dependsOn(commonMain)
6265
}

0 commit comments

Comments
 (0)