From 4a8eec8166ab3f366440cb09fd13458351de42b3 Mon Sep 17 00:00:00 2001 From: soarex Date: Tue, 23 Aug 2022 20:58:31 +0000 Subject: [PATCH] Fix test environment setup in atomicfu plugin Co-authored-by: soarex Merge-request: KT-MR-6915 Merged-by: Maria Sokolova --- plugins/atomicfu/atomicfu-compiler/build.gradle.kts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts index 122f4af236a..3472076dfef 100644 --- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts +++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts @@ -1,6 +1,7 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages +import org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin description = "Atomicfu Compiler Plugin" @@ -117,11 +118,13 @@ projectTest(jUnitMode = JUnitMode.JUnit5) { setUpJsIrBoxTests() } +val d8Plugin = D8RootPlugin.apply(rootProject) +d8Plugin.version = v8Version + fun Test.setupV8() { - dependsOn(":js:js.tests:unzipV8") + dependsOn(d8Plugin.setupTaskProvider) doFirst { - val unzipV8Task = project.tasks.getByPath(":js:js.tests:unzipV8") - systemProperty("javascript.engine.path.V8", File(unzipV8Task.outputs.files.single().path, "d8")) + systemProperty("javascript.engine.path.V8", d8Plugin.requireConfigured().executablePath.absolutePath) } }