Remove more Groovy code by migrating Task interface to Kotlin

Author: mannodermaus

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

@@ -1,30 +1,17 @@
 package de.mannodermaus.gradle.plugins.junit5
 
-import de.mannodermaus.gradle.plugins.junit5.LogUtils.Level
-import de.mannodermaus.gradle.plugins.junit5.internal.agpStyleLog
 import de.mannodermaus.gradle.plugins.junit5.internal.android
 import de.mannodermaus.gradle.plugins.junit5.internal.ext
-import groovy.lang.Closure
 import org.gradle.api.Project
 import org.gradle.api.ProjectConfigurationException
 import org.gradle.api.artifacts.Dependency
-import org.gradle.api.logging.Logger
 import java.util.Properties
 
 /*
  * Model classes holding information about the transitive dependencies of the plugin,
  * exposed to consumers through the custom dependency handler.
  */
 
-/* Extensions */
-
-private fun Logger.replacementWarning(oldName: String, newName: String) {
-  this.agpStyleLog(
-      message = "The JUnit 5 dependency on '$oldName' " +
-          "is deprecated and will be removed in a future version. Please use '$newName' instead!",
-      level = Level.WARNING)
-}
-
 /* Types */
 
 /**

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

@@ -3,6 +3,7 @@ package de.mannodermaus.gradle.plugins.junit5
 import de.mannodermaus.gradle.plugins.junit5.internal.android
 import de.mannodermaus.gradle.plugins.junit5.internal.extend
 import de.mannodermaus.gradle.plugins.junit5.internal.extensionByName
+import de.mannodermaus.gradle.plugins.junit5.tasks.JUnit5UnitTest
 import groovy.lang.Closure
 import org.gradle.api.Action
 import org.gradle.api.Project

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

@@ -6,15 +6,16 @@ import com.android.build.gradle.api.UnitTestVariant
 import com.android.build.gradle.internal.api.TestedVariant
 import com.android.builder.model.Version
 import de.mannodermaus.gradle.plugins.junit5.AndroidJUnitPlatformPlugin
-import de.mannodermaus.gradle.plugins.junit5.LogUtils
-import de.mannodermaus.gradle.plugins.junit5.LogUtils.Level
-import de.mannodermaus.gradle.plugins.junit5.LogUtils.Level.INFO
 import de.mannodermaus.gradle.plugins.junit5.internal.ConfigurationKind.APP
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.logging.LogLevel
+import org.gradle.api.logging.LogLevel.ERROR
+import org.gradle.api.logging.LogLevel.INFO
+import org.gradle.api.logging.LogLevel.WARN
 import org.gradle.api.logging.Logger
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.plugins.ExtraPropertiesExtension
@@ -70,8 +71,19 @@ fun MutableMap<String, String>.append(
 
 /* Extensions for Gradle */
 
-fun Logger.agpStyleLog(message: String, level: Level = INFO) {
-  LogUtils.agpStyleLog(this, level, message)
+/**
+ * Log a message with the Android Gradle Plugin style syntax,
+ * which will cause Android Studio to pick it up & display it inside the Messages window.
+ */
+fun Logger.agpLog(level: LogLevel, message: String) {
+  val pair: Pair<String, (String) -> Unit> = when (level) {
+    ERROR -> "error" to { s -> error(s) }
+    WARN -> "warning" to { s -> warn(s) }
+    INFO -> "info" to { s -> info(s) }
+    else -> "debug" to { s -> debug(s) }
+  }
+  val (kind, log) = pair
+  log("""AGBPI: {"kind": "$kind","text":"$message"}""")
 }
 
 /* Interoperability layer for Gradle */

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

@@ -6,6 +6,56 @@ import com.android.build.gradle.internal.scope.VariantScope
 import de.mannodermaus.gradle.plugins.junit5.variantData
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.gradle.process.JavaForkOptions
+import org.gradle.process.ProcessForkOptions
+
+/**
+ * Base for tasks added by plugin, shared between
+ * the "Run All" task and its individual variant-aware ones.
+ */
+interface JUnit5UnitTest : 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
+   */
+  val isRunAllTask: Boolean
+
+  /**
+   * Access the underlying JavaForkOptions, if present on this task.
+   * @return The task's JavaForkOptions, if any
+   */
+  val 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.
+  */
+
+  /**
+   * Adds the provided arguments to the Java process executing the tests.
+   * Does nothing if specified on the "Run All" task.
+   * @return Self
+   */
+  fun jvmArgs(vararg args: Any): JavaForkOptions
+
+  /**
+   * Adds the provided system property to the Java process executing the tests.
+   * Does nothing if specified on the "Run All" task.
+   * @return Self
+   */
+  fun systemProperty(key: String, value: Any?): JavaForkOptions
+
+  /**
+   * Adds the provided environment variable to the Java process executing the tests.
+   * Does nothing if specified on the "Run All" task.
+   * @return Self
+   */
+  fun environment(key: String, value: Any?): ProcessForkOptions
+}
 
 /**
  * Base for ConfigActions related to custom plugin tasks

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

@@ -5,7 +5,6 @@ import com.android.build.gradle.internal.scope.TaskConfigAction
 import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.tasks.factory.AndroidUnitTest
 import de.mannodermaus.gradle.plugins.junit5.AndroidJUnitPlatformExtension
-import de.mannodermaus.gradle.plugins.junit5.JUnit5UnitTest
 import de.mannodermaus.gradle.plugins.junit5.VariantTypeCompat
 import de.mannodermaus.gradle.plugins.junit5.internal.android
 import de.mannodermaus.gradle.plugins.junit5.internal.junit5Info
@@ -23,7 +22,6 @@ import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.Optional
 import org.gradle.process.JavaForkOptions
-import org.gradle.process.ProcessForkOptions
 import org.gradle.process.internal.DefaultJavaForkOptions
 import org.junit.platform.console.ConsoleLauncher
 import java.io.File
@@ -61,9 +59,10 @@ open class AndroidJUnit5UnitTest : JavaExec(), JUnit5UnitTest {
   @Optional
   var assetsCollection: FileCollection? = null
 
-  override fun isRunAllTask() = false
+  override val isRunAllTask = false
 
-  override fun javaForkOptions() = java.util.Optional.of<JavaForkOptions>(this)
+  @Suppress("LeakingThis")
+  override val javaForkOptions = this as JavaForkOptions
 
   /**
    * Configuration closure for an Android JUnit5 test task.
@@ -271,36 +270,18 @@ 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())
 
-  override fun isRunAllTask() = true
+  override val isRunAllTask = true
 
-  override fun javaForkOptions() = java.util.Optional.empty<JavaForkOptions>()
+  override val javaForkOptions: JavaForkOptions? = null
 
   /* JavaForkOptions facade */
 
-  override fun getJvmArgs() = emptyList<String>()
-  override fun setJvmArgs(var1: MutableList<String>?) {
-  }
-
-  override fun setJvmArgs(var1: MutableIterable<*>?) {
-  }
-
-  override fun jvmArgs(var1: MutableIterable<*>?): JavaForkOptions = emptyJavaForkOptions
-  override fun jvmArgs(vararg var1: Any?): JavaForkOptions = emptyJavaForkOptions
+  override fun jvmArgs(vararg args: Any) = emptyJavaForkOptions
 
-  override fun getSystemProperties() = mutableMapOf<String, Any>()
-  override fun setSystemProperties(var1: MutableMap<String, *>?) {
-  }
-
-  override fun systemProperties(
-      var1: MutableMap<String, *>?): JavaForkOptions = emptyJavaForkOptions
-
-  override fun systemProperty(var1: String?, var2: Any?): JavaForkOptions = emptyJavaForkOptions
-  override fun getEnvironment() = mutableMapOf<String, Any>()
-  override fun setEnvironment(var1: MutableMap<String, *>?) {
-  }
+  override fun systemProperty(key: String, value: Any?) = emptyJavaForkOptions
 
-  override fun environment(var1: MutableMap<String, *>?): ProcessForkOptions = emptyJavaForkOptions
-  override fun environment(var1: String?, var2: Any?): ProcessForkOptions = emptyJavaForkOptions
+  override fun environment(key: String, value: Any?) = emptyJavaForkOptions
 }

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

@@ -5,6 +5,7 @@ buildscript {
   repositories {
     google()
     jcenter()
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
   }
 
   dependencies {

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

@@ -2,6 +2,7 @@ buildscript {
   repositories {
     google()
     jcenter()
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
   }
 
   dependencies {