Replace temp config param in instrumentation with the proper replacement

Author: mannodermaus

instrumentation/buildSrc/src/main/java/LocalProjectDependencyConfigurator.kt

@@ -0,0 +1,25 @@
+import org.gradle.api.Project
+
+// Use local project dependencies on android-test instrumentation libraries
+// for the modules inside this repository, instead of relying on their Maven coordinates.
+// This is not needed for normal consumers, but we want it to test our own code.
+private val instrumentationLibraryRegex =
+    Regex("de\\.mannodermaus\\.junit5:android-test-([a-z0-9]+)(-.+)?:")
+
+fun Project.replaceAndroidTestLibsWithLocalProjectDependencies() {
+    val self = this
+
+    configurations.all {
+        if ("DebugAndroidTestRuntimeClasspath" in name) {
+            resolutionStrategy.dependencySubstitution.all {
+                instrumentationLibraryRegex.find(requested.toString())?.let { result ->
+                    val replacement = project(":${result.groupValues[1]}")
+                    println(
+                        "In $self, replace androidTest dependency '$requested' with $replacement"
+                    )
+                    useTarget(replacement)
+                }
+            }
+        }
+    }
+}

instrumentation/compose/build.gradle.kts

@@ -18,14 +18,7 @@ android {
     buildFeatures { compose = true }
 }
 
-junitPlatform {
-    // Using local dependency instead of Maven coordinates
-    instrumentationTests.enabled = false
-
-    // Fail test execution when running on unsupported device
-    // (TODO: Change this to the proper instrumentationTests API once released as stable)
-    configurationParameter("de.mannodermaus.junit.unsupported.behavior", "fail")
-}
+replaceAndroidTestLibsWithLocalProjectDependencies()
 
 dependencies {
     implementation(project(":core"))

instrumentation/core/build.gradle.kts

@@ -18,25 +18,9 @@ junitPlatform {
         // See TaggedTests.kt for usage of this tag
         excludeTags("nope")
     }
-
-    // Fail test execution when running on unsupported device
-    // (TODO: Change this to the proper instrumentationTests API once released as stable)
-    configurationParameter("de.mannodermaus.junit.unsupported.behavior", "fail")
 }
 
-// Use local project dependencies on android-test instrumentation libraries
-// instead of relying on their Maven coordinates for this module
-val instrumentationLibraryRegex = Regex("de\\.mannodermaus\\.junit5:android-test-(.+):")
-
-configurations.all {
-    if ("DebugAndroidTestRuntimeClasspath" in name) {
-        resolutionStrategy.dependencySubstitution.all {
-            instrumentationLibraryRegex.find(requested.toString())?.let { result ->
-                useTarget(project(":${result.groupValues[1]}"))
-            }
-        }
-    }
-}
+replaceAndroidTestLibsWithLocalProjectDependencies()
 
 dependencies {
     implementation(libs.kotlin.stdlib)

instrumentation/sample/build.gradle.kts

@@ -37,15 +37,10 @@ android {
 junitPlatform {
     // Configure JUnit 5 tests here
     filters("debug") { excludeTags("slow") }
-
-    // Using local dependency instead of Maven coordinates
-    instrumentationTests.enabled = false
-
-    // Fail test execution when running on unsupported device
-    // (TODO: Change this to the proper instrumentationTests API once released as stable)
-    configurationParameter("de.mannodermaus.junit.unsupported.behavior", "fail")
 }
 
+replaceAndroidTestLibsWithLocalProjectDependencies()
+
 dependencies {
     implementation(libs.kotlin.stdlib)