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

[JS] Use kotlin-stdlib-js.klib instead of *.jar

Browse Source
This commit is contained in:
Ilya Goncharov
2023-10-10 14:44:49 +02:00
committed by Space Team
parent a79324037d
commit e9cc2931cc
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class ForTestCompileRuntime {
@NotNull
public static File stdlibJsForTests() {
return assertExists(new File("dist/kotlinc/lib/kotlin-stdlib-js.jar"));
return assertExists(new File("dist/kotlinc/lib/kotlin-stdlib-js.klib"));
}
@NotNull
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/KotlinStandardLibrariesPathProvider.kt
+4 -4
View File
@@ -73,7 +73,7 @@ abstract class KotlinStandardLibrariesPathProvider : TestService {
abstract fun getAnnotationsJar(): File
/**
* kotlin-stdlib-js.jar
* kotlin-stdlib-js.klib
*/
abstract fun fullJsStdlib(): File
@@ -124,9 +124,9 @@ object StandardLibrariesPathProviderForKotlinProject : KotlinStandardLibrariesPa
override fun jvmAnnotationsForTests(): File = ForTestCompileRuntime.jvmAnnotationsForTests()
override fun getAnnotationsJar(): File = KtTestUtil.getAnnotationsJar()
override fun fullJsStdlib(): File = extractFromPropertyFirst("kotlin.js.full.stdlib.path") { "kotlin-stdlib-js.jar".dist() }
override fun defaultJsStdlib(): File = extractFromPropertyFirst("kotlin.js.reduced.stdlib.path") { "kotlin-stdlib-js.jar".dist() }
override fun kotlinTestJsKLib(): File = extractFromPropertyFirst("kotlin.js.kotlin.test.path") { "kotlin-test-js.jar".dist() }
override fun fullJsStdlib(): File = extractFromPropertyFirst("kotlin.js.full.stdlib.path") { "kotlin-stdlib-js.klib".dist() }
override fun defaultJsStdlib(): File = extractFromPropertyFirst("kotlin.js.reduced.stdlib.path") { "kotlin-stdlib-js.klib".dist() }
override fun kotlinTestJsKLib(): File = extractFromPropertyFirst("kotlin.js.kotlin.test.path") { "kotlin-test-js.klib".dist() }
private inline fun extractFromPropertyFirst(prop: String, onMissingProperty: () -> String): File {
val path = System.getProperty(prop, null) ?: onMissingProperty()