Add initial Gradle 4.6 Support (#63)

* Update wrapper to Gradle 4.6
* Expose "jvmArgs", "systemProperties" and "environment" facade methods directly on the common Unit Test interface.
* Remove most unused stuff from JUnit5UnitTestRunAll class. 
* Add two new methods to the common interface, to determine Run All task at runtime ("isRunAllTask()") and access to the remaining JavaForkOptions available only to the actual
debug/release test tasks ("javaForkOptions()", returning Optional)
* Add a remark about minimum req. Gradle version to the README

Author: Marcel Schnelle

README.md

@@ -152,6 +152,17 @@ dependencies {
 }
 ```
 
+## Gradle Compatibility
+
+The plugin's minimum required version of Gradle has increased over time to maximize its leverage with new APIs and performance.
+The chart describes the evolution of this requirement. If you can't use the latest version of this plugin due to your
+project's Gradle version, please refer to the following table to find the corresponding plugin that works for you.
+
+|Plugin Version|Minimum Gradle Version|
+|---|---|
+|1.0.30|2.5|
+|1.0.31|4.3|
+
 ## Licenses
 
 #### android-junit5-embedded-runtime:

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

@@ -350,7 +350,7 @@ class PluginSpec : Spek({
           unitTests.all {
             dependsOn(anotherTaskDep)
 
-            if (name == "junitPlatformTest") {
+            if (isRunAllTask) {
               dependsOn(defaultTaskDep)
             }
           }

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

@@ -1,6 +1,8 @@
 package de.mannodermaus.gradle.plugins.junit5
 
 import org.gradle.api.Task
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
 import org.gradle.process.JavaForkOptions
 import org.gradle.process.ProcessForkOptions
 
@@ -9,4 +11,56 @@ import org.gradle.process.ProcessForkOptions
  * to be referenced from Groovy indirectly.
  */
 
-interface JUnit5UnitTest extends Task, JavaForkOptions, ProcessForkOptions {}
+interface JUnit5UnitTest extends Task {
+
+  /**
+   * Whether or not this is the "Run All" JUnit 5 task. It doesn't over the entire JavaForkOptions API,
+   * and instead will only be a facade.
+   * @return True if "Run All" task, false if individual test task
+   */
+  boolean isRunAllTask()
+
+  /**
+   * Access the underlying JavaForkOptions, or return an empty Optional if no such options are
+   * available to this task (e.g., for the "Run All" task.
+   * @return An Optional of the task's JavaForkOptions, if any
+   */
+  java.util.Optional<JavaForkOptions> javaForkOptions()
+
+  /*
+   * Subset of JavaForkOptions API, shared between Unit Tests and "Run All" task,
+   * so they can be configured together using unitTests.all {}.
+   *
+   * If a user needs to find out whether or not the "Run All" task is being processed or not,
+   * use the "isRunAllTask()" API.
+   */
+
+  @Optional
+  @Input
+  List<String> getJvmArgs()
+
+  void setJvmArgs(List<String> var1)
+
+  void setJvmArgs(Iterable<?> var1)
+
+  JavaForkOptions jvmArgs(Iterable<?> var1)
+
+  JavaForkOptions jvmArgs(Object... var1)
+
+  @Input
+  Map<String, Object> getSystemProperties()
+
+  void setSystemProperties(Map<String, ?> var1)
+
+  JavaForkOptions systemProperties(Map<String, ?> var1)
+
+  JavaForkOptions systemProperty(String var1, Object var2)
+
+  Map<String, Object> getEnvironment()
+
+  void setEnvironment(Map<String, ?> var1)
+
+  ProcessForkOptions environment(Map<String, ?> var1)
+
+  ProcessForkOptions environment(String var1, Object var2)
+}

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

@@ -32,7 +32,6 @@ import org.gradle.api.tasks.Optional
 import org.gradle.process.JavaForkOptions
 import org.gradle.process.ProcessForkOptions
 import org.gradle.process.internal.DefaultJavaForkOptions
-import org.gradle.process.internal.DefaultProcessForkOptions
 import org.junit.platform.console.ConsoleLauncher
 import java.io.File
 
@@ -69,6 +68,10 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
   @Optional
   var assetsCollection: FileCollection? = null
 
+  override fun isRunAllTask() = false
+
+  override fun javaForkOptions() = java.util.Optional.of<JavaForkOptions>(this)
+
   /**
    * Configuration closure for an Android JUnit5 test task.
    */
@@ -272,110 +275,36 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
  * Allows the default task to also be configured by unitTests.all.
  */
 open class JUnit5UnitTestRunAll : DefaultTask(), JUnit5UnitTest {
-
   private val emptyJavaForkOptions = DefaultJavaForkOptions(IdentityFileResolver())
-  private val emptyProcessForkOptions = DefaultProcessForkOptions(IdentityFileResolver())
-  private val emptyFileCollection = project.files()
-
-  override fun setSystemProperties(p0: MutableMap<String, *>?) {
-  }
-
-  override fun getExecutable() = ""
-
-  override fun setDefaultCharacterEncoding(p0: String?) {
-  }
-
-  override fun jvmArgs(p0: MutableIterable<*>?) = emptyJavaForkOptions
-
-  override fun jvmArgs(vararg p0: Any?) = emptyJavaForkOptions
-
-  override fun environment(p0: MutableMap<String, *>?) = emptyProcessForkOptions
-
-  override fun environment(p0: String?, p1: Any?) = emptyProcessForkOptions
-
-  override fun setMinHeapSize(p0: String?) {
-  }
-
-  override fun systemProperties(p0: MutableMap<String, *>?) = emptyJavaForkOptions
-
-  override fun setExecutable(p0: String?) {
-  }
-
-  override fun setExecutable(p0: Any?) {
-  }
-
-  override fun executable(p0: Any?) = emptyProcessForkOptions
-
-  override fun setJvmArgs(p0: MutableList<String>?) {
-  }
-
-  override fun setJvmArgs(p0: MutableIterable<*>?) {
-  }
 
-  override fun setAllJvmArgs(p0: MutableList<String>?) {
-  }
-
-  override fun setAllJvmArgs(p0: MutableIterable<*>?) {
-  }
-
-  override fun setDebug(p0: Boolean) {
-  }
-
-  override fun getWorkingDir() = project.file("")
-
-  override fun setBootstrapClasspath(p0: FileCollection?) {
-  }
-
-  override fun getDefaultCharacterEncoding() = ""
-
-  override fun setMaxHeapSize(p0: String?) {
-  }
-
-  override fun systemProperty(p0: String?, p1: Any?) = emptyJavaForkOptions
+  override fun isRunAllTask() = true
 
-  override fun getBootstrapClasspath() = emptyFileCollection
+  override fun javaForkOptions() = java.util.Optional.empty<JavaForkOptions>()
 
-  override fun workingDir(p0: Any?) = emptyProcessForkOptions
+  /* JavaForkOptions facade */
 
-  override fun setWorkingDir(p0: File?) {
+  override fun getJvmArgs() = emptyList<String>()
+  override fun setJvmArgs(var1: MutableList<String>?) {
   }
 
-  override fun setWorkingDir(p0: Any?) {
+  override fun setJvmArgs(var1: MutableIterable<*>?) {
   }
 
-  override fun setEnvironment(p0: MutableMap<String, *>?) {
-  }
-
-  override fun getEnableAssertions() = false
-
-  override fun setEnableAssertions(p0: Boolean) {
-  }
-
-  override fun getMaxHeapSize() = ""
-
-  override fun copyTo(p0: JavaForkOptions?) = emptyJavaForkOptions
+  override fun jvmArgs(var1: MutableIterable<*>?): JavaForkOptions = emptyJavaForkOptions
+  override fun jvmArgs(vararg var1: Any?): JavaForkOptions = emptyJavaForkOptions
 
-  override fun copyTo(p0: ProcessForkOptions?) = emptyProcessForkOptions
-
-  override fun getJvmArgs(): MutableList<String> {
-    return mutableListOf()
-  }
-
-  override fun getSystemProperties(): MutableMap<String, Any> {
-    return mutableMapOf()
+  override fun getSystemProperties() = mutableMapOf<String, Any>()
+  override fun setSystemProperties(var1: MutableMap<String, *>?) {
   }
 
-  override fun getMinHeapSize() = ""
+  override fun systemProperties(
+      var1: MutableMap<String, *>?): JavaForkOptions = emptyJavaForkOptions
 
-  override fun getEnvironment(): MutableMap<String, Any> {
-    return mutableMapOf()
+  override fun systemProperty(var1: String?, var2: Any?): JavaForkOptions = emptyJavaForkOptions
+  override fun getEnvironment() = mutableMapOf<String, Any>()
+  override fun setEnvironment(var1: MutableMap<String, *>?) {
   }
 
-  override fun getAllJvmArgs(): MutableList<String> {
-    return mutableListOf()
-  }
-
-  override fun getDebug() = false
-
-  override fun bootstrapClasspath(vararg p0: Any?) = emptyJavaForkOptions
+  override fun environment(var1: MutableMap<String, *>?): ProcessForkOptions = emptyJavaForkOptions
+  override fun environment(var1: String?, var2: Any?): ProcessForkOptions = emptyJavaForkOptions
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip