fixup! [K/N][tests] Simplify nativeTest properties
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt
index 88aed4fc..f99b77c 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/nativeTest.kt
@@ -62,6 +62,7 @@
private open class NativeArgsProvider @Inject constructor(
project: Project,
+ inputs: TaskInputs,
private val layout: ProjectLayout,
private val objects: ObjectFactory,
private val providers: ProviderFactory,
@@ -97,6 +98,16 @@
}
}
+ init {
+ TestProperty.values().forEach { p ->
+ val value = providers.testProperty(p)
+ definedProperties[p] = value
+ value.orNull?.let {
+ inputs.property(p.shortName, it)
+ }
+ }
+ }
+
@get:Input
@get:Optional
protected val testTarget = gradleProperty(TEST_TARGET)
@@ -104,72 +115,12 @@
@get:Input
@get:Optional
@Suppress("unused") // used by Gradle via reflection
- protected val testMode = gradleProperty(TEST_MODE)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
protected val testKind = gradleProperty(TEST_KIND) {
set(providers.testProperty(FORCE_STANDALONE).map { "STANDALONE" })
}
@get:Input
@get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val compileOnly = gradleProperty(COMPILE_ONLY)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val optimizationMode = gradleProperty(OPTIMIZATION_MODE)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val useThreadStateChecker = gradleProperty(USE_THREAD_STATE_CHECKER)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val gcType = gradleProperty(GC_TYPE)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val gcScheduler = gradleProperty(GC_SCHEDULER)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val allocator = gradleProperty(ALLOCATOR)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val cacheMode = gradleProperty(CACHE_MODE)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val executionTimeout = gradleProperty(EXECUTION_TIMEOUT)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val sanitizer = gradleProperty(SANITIZER)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val sharedTestExecution = gradleProperty(SHARED_TEST_EXECUTION)
-
- @get:Input
- @get:Optional
- @Suppress("unused") // used by Gradle via reflection
- protected val eagerGroupCreation = gradleProperty(EAGER_GROUP_CREATION)
-
- @get:Input
- @get:Optional
protected val xctestFramework = gradleProperty(XCTEST_FRAMEWORK)
@get:Input
@@ -288,7 +239,7 @@
// additional stack frames more compared to the old one because of another launcher, etc. and it turns out this is not enough.
jvmArgs("-Xss2m")
- jvmArgumentProviders.add(objects.newInstance(NativeArgsProvider::class.java, requirePlatformLibs).apply {
+ jvmArgumentProviders.add(objects.newInstance(NativeArgsProvider::class.java, inputs, requirePlatformLibs).apply {
this.compilerClasspath.from(customCompilerDependencies)
this.compilerPluginDependencies.from(compilerPluginDependencies)
this.customKLibs.from(customTestDependencies)
