diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 2e8b4925d68..c8a7c9b2b25 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -12,6 +12,7 @@ import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.ProjectDependency +import org.gradle.api.file.FileCollection import org.gradle.api.file.FileSystemOperations import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter import org.gradle.api.tasks.TaskProvider @@ -333,8 +334,9 @@ fun Project.confugureFirPluginAnnotationsDependency(testTask: TaskProvider testTask.configure { dependsOn(firPluginAnnotations) + val localFirPluginAnnotations: FileCollection = firPluginAnnotations doFirst { - systemProperty("firPluginAnnotations.path", firPluginAnnotations.singleFile.canonicalPath) + systemProperty("firPluginAnnotations.path", localFirPluginAnnotations.singleFile.canonicalPath) } } } diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts index 3472076dfef..98eedf8d476 100644 --- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts +++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts @@ -110,10 +110,13 @@ projectTest(jUnitMode = JUnitMode.JUnit5) { useJUnitPlatform() workingDir = rootDir dependsOn(atomicfuJsIrRuntimeForTests) + val localAtomicfuJsIrRuntimeForTests: FileCollection = atomicfuJsIrRuntimeForTests + val localAtomicfuJsClasspath: FileCollection = atomicfuJsClasspath + val localAtomicfuJvmClasspath: FileCollection = atomicfuJvmClasspath doFirst { - systemProperty("atomicfuJsIrRuntimeForTests.classpath", atomicfuJsIrRuntimeForTests.asPath) - systemProperty("atomicfuJs.classpath", atomicfuJsClasspath.asPath) - systemProperty("atomicfuJvm.classpath", atomicfuJvmClasspath.asPath) + systemProperty("atomicfuJsIrRuntimeForTests.classpath", localAtomicfuJsIrRuntimeForTests.asPath) + systemProperty("atomicfuJs.classpath", localAtomicfuJsClasspath.asPath) + systemProperty("atomicfuJvm.classpath", localAtomicfuJvmClasspath.asPath) } setUpJsIrBoxTests() } @@ -123,8 +126,9 @@ d8Plugin.version = v8Version fun Test.setupV8() { dependsOn(d8Plugin.setupTaskProvider) + val v8ExecutablePath = d8Plugin.requireConfigured().executablePath.absolutePath doFirst { - systemProperty("javascript.engine.path.V8", d8Plugin.requireConfigured().executablePath.absolutePath) + systemProperty("javascript.engine.path.V8", v8ExecutablePath) } }