Force correct JUnit BOM for our own internal instrumentation tests

Author: mannodermaus

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

@@ -1,23 +1,41 @@
+import extensions.library
+import extensions.libs
 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 {
+        if ("DebugAndroidTestRuntimeClasspath" !in name) {
+            return@all
+        }
+
+        resolutionStrategy {
+            // Force a specific version of the JUnit BOM, depending on the actual configuration
+            SupportedJUnit.values().forEach { junit ->
+                if (name.startsWith(junit.variant)) {
+                    force(
+                        when (junit) {
+                            SupportedJUnit.JUnit5 -> libs.library("junit-framework-bom5")
+                            SupportedJUnit.JUnit6 -> libs.library("junit-framework-bom6")
+                        }
+                    )
+                }
+            }
+
+            // Use local project dependencies on android-test instrumentation libraries
+            // for the modules inside this repository, instead of relying on their Maven coords.
+            // This is not needed for normal consumers, but we need it to test our own code.
+            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)
+                    useTarget(replacement, "Use $replacement to substitute dependency '$requested'")
                 }
             }
         }

instrumentation/compose/build.gradle.kts

@@ -45,9 +45,6 @@ dependencies {
     androidTestImplementation(libs.junit.jupiter.api)
     androidTestImplementation(libs.junit.jupiter.params)
     androidTestImplementation(libs.espresso)
-
-    androidTestRuntimeOnly(project(":runner"))
-    androidTestRuntimeOnly(libs.androidx.test.runner)
 }
 
 project.configureDeployment(Artifacts.Instrumentation.Compose)

instrumentation/core/build.gradle.kts

@@ -41,7 +41,6 @@ dependencies {
     androidTestImplementation(libs.junit.jupiter.api)
     androidTestImplementation(libs.junit.jupiter.params)
     androidTestImplementation(libs.espresso)
-    androidTestRuntimeOnly(project(":runner"))
 
     testImplementation(project(":testutil"))
 }

instrumentation/sample/build.gradle.kts

@@ -55,6 +55,4 @@ dependencies {
     androidTestImplementation(libs.junit.jupiter.api)
     androidTestImplementation(libs.junit.jupiter.params)
     androidTestImplementation(libs.espresso)
-    androidTestImplementation(project(":core"))
-    androidTestRuntimeOnly(project(":runner"))
 }