Turn on instrumentation integration using AndroidJUnit5Builder by default

Author: mannodermaus

android-junit5-tests/src/test/kotlin/de/mannodermaus/gradle/plugins/junit5/PluginSpec.kt

@@ -224,7 +224,6 @@ class PluginSpec : Spek({
           vintageVersion = "1.2.3"
 
           instrumentationTests {
-            enabled(true)
             version = "4.8.15"
           }
         }

android-junit5/src/main/groovy/de/mannodermaus/gradle/plugins/junit5/AndroidJUnitPlatformExtension.groovy

@@ -164,7 +164,7 @@ class AndroidJUnitPlatformExtension extends JUnitPlatformExtension {
   static class InstrumentationTestOptions {
 
     /** Whether or not to enable support for JUnit 5 instrumentation tests. */
-    private boolean enabled = false
+    private boolean enabled = true
 
     /** The version of the instrumentation companion library to use. */
     @Nullable String version

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/Dependencies.kt

@@ -85,9 +85,9 @@ class JUnit5DependencyHandler(
     if (!project.junit5.instrumentationTests.enabled) {
       @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
       throw ProjectConfigurationException("""
-        The JUnit 5 Instrumentation Test library can only be used
-        if support for them is explicitly enabled as well.
-        Please add the following to your build.gradle:
+        The JUnit 5 Instrumentation Test library can't be used
+        if it is disabled via the plugin.
+        Please revise the following in your build.gradle:
         android.testOptions {
           junitPlatform {
             instrumentationTests.enabled true
@@ -96,7 +96,9 @@ class JUnit5DependencyHandler(
         """.trimIndent(), null)
     }
 
-    return listOf(versions.others.instrumentationTest)
+    return listOf(
+        versions.others.instrumentationTest
+    )
   }
 
   /* Internal */
@@ -172,6 +174,7 @@ class Platform(
   val launcher = dependency("junit-platform-launcher")
   val console = dependency("junit-platform-console")
   val engine = dependency("junit-platform-engine")
+  val runner = dependency("junit-platform-runner")
 }
 
 /**

android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/Plugin.kt

@@ -138,11 +138,14 @@ class AndroidJUnitPlatformPlugin : Plugin<Project> {
               "Change your declaration to '$actualRunnerBuilder,$JUNIT5_RUNNER_BUILDER_CLASS_NAME'.")
     }
 
-    // Attach runtime-only dependency on JUnit 5 instrumentation test facade
-    val defaults = loadProperties(VERSIONS_RESOURCE_NAME)
-    val rtOnly = configurations.findConfiguration(kind = ANDROID_TEST, scope = RUNTIME_ONLY)
-    withLoadedVersions(defaults) {
-      rtOnly.dependencies.add(it.others.instrumentationRunner)
+    // Attach runtime-only dependency on JUnit 5 instrumentation test facade, unless disabled
+    if (junit5.instrumentationTests.enabled) {
+      val defaults = loadProperties(VERSIONS_RESOURCE_NAME)
+      val rtOnly = configurations.findConfiguration(kind = ANDROID_TEST, scope = RUNTIME_ONLY)
+      withLoadedVersions(defaults) {
+        rtOnly.dependencies.add(it.others.instrumentationRunner)
+        rtOnly.dependencies.add(it.platform.runner)
+      }
     }
   }
 

gradle.properties

@@ -12,7 +12,7 @@ LICENSE_NAME                                = Apache-2.0
 PLUGIN_GROUP_ID                             = de.mannodermaus.gradle.plugins
 PLUGIN_ARTIFACT_ID                          = android-junit5
 PLUGIN_DESCRIPTION                          = Unit Testing with JUnit 5 for Android.
-PLUGIN_RUNTIME_VERSION_NAME                 = 1.0.31
+PLUGIN_RUNTIME_VERSION_NAME                 = 1.0.31-SNAPSHOT
 PLUGIN_RUNTIME_VERSION_NAME_LATEST_STABLE   = 1.0.30
 
 # Artifact configuration (embedded-runtime)