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

Replace kotlin-test-js project dependencies in the project

Browse Source 
KT-61969
This commit is contained in:
Ilya Gorbunov
2023-11-12 04:24:07 +01:00
committed by Space Team
parent 4b2e1240eb
commit c40de28775
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/build.gradle.kts
+6 -6
View File
@@ -76,7 +76,7 @@ dependencies {
testRuntimeOnly(kotlinStdlib())
testJsRuntime(kotlinStdlib())
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
testJsRuntime(project(":kotlin-test:kotlin-test-js-ir")) // to be sure that kotlin-test-js built before tests run
testJsRuntime(kotlinTest("js")) // to be sure that kotlin-test-js built before tests run
}
testRuntimeOnly(project(":kotlin-preloader")) // it's required for ant tests
testRuntimeOnly(project(":compiler:backend-common"))
@@ -265,12 +265,12 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean, firEnabled: B
systemProperty("kotlin.js.reduced.stdlib.path", "libraries/stdlib/js-ir-minimal-for-test/build/classes/kotlin/js/main")
inputs.dir(rootDir.resolve("libraries/stdlib/js-ir-minimal-for-test/build/classes/kotlin/js/main"))
dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs")
systemProperty("kotlin.js.kotlin.test.path", "libraries/kotlin.test/js-ir/build/classes/kotlin/js/main")
inputs.dir(rootDir.resolve("libraries/kotlin.test/js-ir/build/classes/kotlin/js/main"))
dependsOn(":kotlin-test:compileKotlinJs")
systemProperty("kotlin.js.kotlin.test.path", "libraries/kotlin.test/build/classes/kotlin/js/main")
inputs.dir(rootDir.resolve("libraries/kotlin.test/build/classes/kotlin/js/main"))
systemProperty("kotlin.js.kotlin.test.klib.path", "libraries/kotlin.test/js-ir/build/libs/kotlin-test-js-$version.klib")
inputs.file(rootDir.resolve("libraries/kotlin.test/js-ir/build/libs/kotlin-test-js-$version.klib"))
systemProperty("kotlin.js.kotlin.test.klib.path", "libraries/kotlin.test/build/libs/kotlin-test-js-$version.klib")
inputs.file(rootDir.resolve("libraries/kotlin.test/build/libs/kotlin-test-js-$version.klib"))
}
exclude("org/jetbrains/kotlin/js/testOld/api/*")
libraries/kotlin.test/js-ir/it/build.gradle.kts
+1 -1
View File
@@ -126,7 +126,7 @@ tasks.check {
}
dependencies {
api(project(":kotlin-test:kotlin-test-js-ir"))
api(project(":kotlin-test"))
}
tasks.named("compileTestKotlinJs") {
repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/setupIrJsBoxTests.kt
+4 -4
View File
@@ -11,14 +11,14 @@ fun Test.useJsIrBoxTests(
buildDir: Provider<Directory>,
fullStdLib: String = "libraries/stdlib/build/classes/kotlin/js/main",
reducedStdlibPath: String = "libraries/stdlib/js-ir-minimal-for-test/build/classes/kotlin/js/main",
kotlinJsTestPath: String = "libraries/kotlin.test/js-ir/build/classes/kotlin/js/main",
kotlinJsTestPath: String = "libraries/kotlin.test/build/classes/kotlin/js/main",
domApiCompatPath: String = "libraries/kotlin-dom-api-compat/build/classes/kotlin/main"
) {
setupV8()
dependsOn(":kotlin-stdlib:jsJar")
dependsOn(":kotlin-stdlib:jsJarForTests") // TODO: think how to remove dependency on the artifact in this place
dependsOn(":kotlin-test:kotlin-test-js-ir:jsJar")
dependsOn(":kotlin-test:kotlin-test-js-ir:compileKotlinJs")
dependsOn(":kotlin-test:jsJar")
dependsOn(":kotlin-test:compileKotlinJs")
dependsOn(":kotlin-stdlib-js-ir-minimal-for-test:compileKotlinJs")
dependsOn(":kotlin-dom-api-compat:compileKotlinJs")
@@ -27,6 +27,6 @@ fun Test.useJsIrBoxTests(
systemProperty("kotlin.js.reduced.stdlib.path", reducedStdlibPath)
systemProperty("kotlin.js.kotlin.test.path", kotlinJsTestPath)
systemProperty("kotlin.js.stdlib.klib.path", "libraries/stdlib/build/libs/kotlin-stdlib-js-$version.klib")
systemProperty("kotlin.js.kotlin.test.klib.path", "libraries/kotlin.test/js-ir/build/libs/kotlin-test-js-$version.klib")
systemProperty("kotlin.js.kotlin.test.klib.path", "libraries/kotlin.test/build/libs/kotlin-test-js-$version.klib")
systemProperty("kotlin.js.dom.api.compat", domApiCompatPath)
}