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

[Build] Fix configuration cache issues of miscCompilerTests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2022-11-29 11:03:56 +02:00
committed by Space Team
parent 0af16f03c5
commit fe81ad0bbe
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/tasks.kt
+3 -1
View File
@@ -12,6 +12,7 @@ import org.gradle.api.Project
import org.gradle.api.Task import org.gradle.api.Task
import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.ProjectDependency import org.gradle.api.artifacts.ProjectDependency
import org.gradle.api.file.FileCollection
import org.gradle.api.file.FileSystemOperations import org.gradle.api.file.FileSystemOperations
import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter
import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.TaskProvider
@@ -333,8 +334,9 @@ fun Project.confugureFirPluginAnnotationsDependency(testTask: TaskProvider<Test>
testTask.configure { testTask.configure {
dependsOn(firPluginAnnotations) dependsOn(firPluginAnnotations)
val localFirPluginAnnotations: FileCollection = firPluginAnnotations
doFirst { doFirst {
systemProperty("firPluginAnnotations.path", firPluginAnnotations.singleFile.canonicalPath) systemProperty("firPluginAnnotations.path", localFirPluginAnnotations.singleFile.canonicalPath)
} }
} }
} }
plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+8 -4
View File
@@ -110,10 +110,13 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
useJUnitPlatform() useJUnitPlatform()
workingDir = rootDir workingDir = rootDir
dependsOn(atomicfuJsIrRuntimeForTests) dependsOn(atomicfuJsIrRuntimeForTests)
val localAtomicfuJsIrRuntimeForTests: FileCollection = atomicfuJsIrRuntimeForTests
val localAtomicfuJsClasspath: FileCollection = atomicfuJsClasspath
val localAtomicfuJvmClasspath: FileCollection = atomicfuJvmClasspath
doFirst { doFirst {
systemProperty("atomicfuJsIrRuntimeForTests.classpath", atomicfuJsIrRuntimeForTests.asPath) systemProperty("atomicfuJsIrRuntimeForTests.classpath", localAtomicfuJsIrRuntimeForTests.asPath)
systemProperty("atomicfuJs.classpath", atomicfuJsClasspath.asPath) systemProperty("atomicfuJs.classpath", localAtomicfuJsClasspath.asPath)
systemProperty("atomicfuJvm.classpath", atomicfuJvmClasspath.asPath) systemProperty("atomicfuJvm.classpath", localAtomicfuJvmClasspath.asPath)
} }
setUpJsIrBoxTests() setUpJsIrBoxTests()
} }
@@ -123,8 +126,9 @@ d8Plugin.version = v8Version
fun Test.setupV8() { fun Test.setupV8() {
dependsOn(d8Plugin.setupTaskProvider) dependsOn(d8Plugin.setupTaskProvider)
val v8ExecutablePath = d8Plugin.requireConfigured().executablePath.absolutePath
doFirst { doFirst {
systemProperty("javascript.engine.path.V8", d8Plugin.requireConfigured().executablePath.absolutePath) systemProperty("javascript.engine.path.V8", v8ExecutablePath)
} }
} }