Revert automatic integration of JUnit 5 RunnerBuilder

This will break clients that don't want the android-instrumentation-test
library yet, because the TestInstrumentationRunner will fail on the
missing class' lookup at runtime.

The users will have to specify that manually.

Author: mannodermaus

android-junit5-tests/common.gradle

@@ -18,7 +18,7 @@ configurations {
 processTestResources {
   def tokens = [COMPILE_SDK_VERSION: COMPILE_SDK_VERSION,
                 BUILD_TOOLS_VERSION: BUILD_TOOLS_VERSION,
-                MIN_SDK_VERSION    : MIN_SDK_VERSION,
+                MIN_SDK_VERSION    : SAMPLE_MIN_SDK_VERSION,
                 TARGET_SDK_VERSION : TARGET_SDK_VERSION]
 
   inputs.properties(tokens)

android-junit5-tests/testCommon/src/test/groovy/de/mannodermaus/gradle/plugins/junit5/BasePluginSpec.groovy

@@ -440,17 +440,4 @@ abstract class BasePluginSpec extends Specification {
     project.tasks.findByName("jacocoTestReportDebug") == null
     project.tasks.findByName("jacocoTestReportRelease") == null
   }
-
-  def "Attaches the JUnit 5 Runner Builder to the Android Default Config"() {
-    when:
-    Project project = factory.newProject(rootProject())
-        .asAndroidApplication()
-        .applyJunit5Plugin()
-        .buildAndEvaluate()
-
-    then:
-    def args = project.android.defaultConfig.testInstrumentationRunnerArguments
-    assert args.containsKey("runnerBuilder")
-    assert args["runnerBuilder"] == "de.mannodermaus.junit5.AndroidJUnit5Builder"
-  }
 }

android-junit5-tests/testCommon/src/test/groovy/de/mannodermaus/gradle/plugins/junit5/BaseSomething.groovy

@@ -18,7 +18,3 @@ const val JUNIT_PLATFORM_VERSION_PROP = "junitPlatformVersion"
 const val JUNIT_JUPITER_VERSION_PROP = "junitJupiterVersion"
 const val JUNIT_VINTAGE_VERSION_PROP = "junitVintageVersion"
 const val JUNIT4_VERSION_PROP = "junit4Version"
-
-// Android defaultConfig
-const val RUNNER_BUILDER_ARG = "runnerBuilder"
-const val JUNIT5_RUNNER_BUILDER_CLASS_NAME = "de.mannodermaus.junit5.AndroidJUnit5Builder"

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

@@ -34,7 +34,6 @@ class AndroidJUnitPlatformPlugin : Plugin<Project> {
     project.configureDependencies()
     project.afterEvaluate {
       it.configureTasks()
-      it.configureAndroid()
     }
   }
 
@@ -128,12 +127,4 @@ class AndroidJUnitPlatformPlugin : Plugin<Project> {
 
     return providers
   }
-
-  private fun Project.configureAndroid() {
-    // Include the JUnit 5-based instrumentation Runner
-    // in the default configuration.
-    // This is the gateway for automatic instrumented tests support
-    val defaultConfig = this.android.safeDefaultConfig
-    defaultConfig.testInstrumentationRunnerArguments[RUNNER_BUILDER_ARG] = JUNIT5_RUNNER_BUILDER_CLASS_NAME
-  }
 }

…rmaus/gradle/plugins/junit5/Functions.kt …maus/gradle/plugins/junit5/Extensions.ktandroid-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/Functions.kt renamed to android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/Extensions.kt android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/Functions.kt renamed to android-junit5/src/main/kotlin/de/mannodermaus/gradle/plugins/junit5/Extensions.kt

@@ -24,6 +24,7 @@ INSTRUMENTATION_GROUP_ID                    = de.mannodermaus.junit5
 INSTRUMENTATION_ARTIFACT_ID                 = android-instrumentation-test
 INSTRUMENTATION_DESCRIPTION                 = Extensions for instrumented Android tests with JUnit 5.
 INSTRUMENTATION_VERSION_NAME                = 0.1.1-SNAPSHOT
+INSTRUMENTATION_MIN_SDK_VERSION             = 26
 
 # Dependency versions (plugins)
 ANDROID_PLUGIN_2X_VERSION                   = 2.3.3
@@ -38,12 +39,14 @@ DCENDENTS_MAVEN_PLUGIN_VERSION              = 2.0
 GROOVY_VERSION                              = 3.0.0-alpha-1
 KOTLIN_VERSION                              = 1.2.0
 
-# Android Environment
+# Android Environment (common)
 COMPILE_SDK_VERSION                         = android-27
 BUILD_TOOLS_VERSION                         = 27.0.1
-MIN_SDK_VERSION                             = 26
 TARGET_SDK_VERSION                          = 27
 
+# Android Environment (sample)
+SAMPLE_MIN_SDK_VERSION                      = 14
+
 # Dependency versions
 JUNIT_PLATFORM_VERSION                      = 1.0.2
 JUNIT_JUPITER_VERSION                       = 5.0.2

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

@@ -7,7 +7,7 @@ android {
   compileSdkVersion COMPILE_SDK_VERSION
 
   defaultConfig {
-    minSdkVersion MIN_SDK_VERSION
+    minSdkVersion INSTRUMENTATION_MIN_SDK_VERSION
     targetSdkVersion TARGET_SDK_VERSION
     versionCode 1
     versionName "1.0"

gradle.properties

@@ -1,3 +1,5 @@
+package de.mannodermaus.junit5.sample;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

instrumentation/build.gradle

@@ -1,3 +1,5 @@
+package de.mannodermaus.junit5.sample
+
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertAll