Update README & prepare next version

Author: mannodermaus

README.md

@@ -23,7 +23,7 @@ Furthermore, this repository provides a small showcase of the functionality prov
 ```groovy
 buildscript {
   dependencies {
-    classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.30"
+    classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.31"
   }
 }
 ```
@@ -53,8 +53,7 @@ dependencies {
   // By declaring this dependency, you have to use a minSdkVersion
   // of at least 26, since the nature of JUnit 5 relies on APIs that aren't
   // available on Android devices before then.
-  // Additionally, you are required to explicitly enable support for instrumented tests in the
-  // "junitPlatform" configuration closure (see the section below for details).
+  // Consider creating a product flavor for this - see the sample project for details.
   androidTestImplementation junit5.instrumentationTests()
 }
 ```
@@ -78,25 +77,24 @@ android.testOptions {
     vintageVersion "4.12.2"
 
     // Options related to running unit tests with JUnit 5.
-    unitTests {
-      // Whether or not JUnit 5 test tasks should be affected by
-      // JVM Arguments, System Properties & Environment Variables
-      // declared through "unitTests.all" closures
-      applyDefaultTestOptions true
+    unitTests.all { test ->
+      // Configure custom jvmArgs, system properties and environment variables
+      jvmArgs "--my-argument"
+      systemProperty "my.system.property", "true"
+      environment "MY_ENVIRONMENT", "development"
     }
 
     // Options related to running instrumented tests with JUnit 5.
     // This is an incubating feature which utilizes the backwards-compatibility
     // of the JUnit Platform in order to enhance the default Test Instrumentation Runner
-    // with new power. However, because of their experimental nature and steep minSdkVersion requirement,
-    // they are turned off by default. If you choose to enable them, you also have to declare
-    // the library dependency in your androidTest scope. Please refer to the "Setup"
-    // section for more details.
+    // with new power. As of version 1.0.31, instrumentation test support is provided by default,
+    // but it's up to you to include the JUnit 5 dependencies and write some tests with it.
     instrumentationTests {
-      enabled false
+      // Enable instrumentation tests (default: true)
+      enabled true
 
-      // The Android-Instrumentation-Test dependency version to use
-      version "0.1.1"
+      // The Android-Instrumentation-Test dependency version to use (default: latest)
+      version "0.2.1"
     }
 
     // Configuration of companion tasks for JaCoCo Reports,
@@ -110,6 +108,17 @@ android.testOptions {
       // by default, R.class & BuildConfig.class are excluded.
       excludedClasses += []
       excludedSources += []
+
+      // By default, Jacoco tasks will be generated by the plugin
+      // if the project also applies the Jacoco plugin.
+      // To disable completely, use this flag
+      taskGenerationEnabled = true
+
+      // If instead, you want to generate Jacoco tasks only for certain variants,
+      // this can be specified here. By default, tasks are generated for all variants
+      onlyGenerateTasksForVariants "debug", "release"
+
+      // Configuration for generated Code Coverage reports
       xml {
         enabled true
         destination project.file()

gradle.properties

@@ -12,8 +12,8 @@ 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_LATEST_STABLE   = 1.0.30
+PLUGIN_RUNTIME_VERSION_NAME                 = 1.0.32-SNAPSHOT
+PLUGIN_RUNTIME_VERSION_NAME_LATEST_STABLE   = 1.0.31
 
 # Artifact configuration (embedded-runtime)
 RUNTIME_GROUP_ID                            = de.mannodermaus.gradle.plugins

sample/build.gradle

@@ -29,18 +29,18 @@ android {
 
   // Since the minSdkVersion requirement for JUnit 5 Instrumentation Tests is quite high,
   // we introduce a product flavor that uses an elevated version other than the application's default.
-  // With this, we are able to write JUnit 5
-//  flavorDimensions "kind"
-//  productFlavors {
-//    experimental {
-//      dimension "kind"
-//      minSdkVersion 26
-//    }
-//
-//    normal {
-//      dimension "kind"
-//    }
-//  }
+  // With this, we are able to try JUnit 5 tests without sacrificing the minSdkVersion completely.
+  flavorDimensions "kind"
+  productFlavors {
+    experimental {
+      dimension "kind"
+      minSdkVersion 26
+    }
+
+    normal {
+      dimension "kind"
+    }
+  }
 
   // Add Kotlin source directory to all source sets
   sourceSets.each {
@@ -74,6 +74,7 @@ dependencies {
   androidTestImplementation "junit:junit:$JUNIT4_VERSION"
   androidTestImplementation "com.android.support.test:runner:$SUPPORT_TEST_LIBRARY_VERSION"
 
-//  androidTestExperimentalImplementation junit5.unitTests()
-//  androidTestExperimentalImplementation junit5.instrumentationTests()
+  // Include the instrumentation test dependencies to the product flavor
+  androidTestExperimentalImplementation junit5.unitTests()
+  androidTestExperimentalImplementation junit5.instrumentationTests()
 }