Clean-up of Kotlin extensions

Author: mannodermaus

android-junit5/build.gradle

@@ -83,6 +83,7 @@ dependencies {
 
   // Dependent Plugins
   compile "org.junit.platform:junit-platform-gradle-plugin:$JUNIT_PLATFORM_VERSION"
+  compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
   compileOnly "com.android.tools.build:gradle:$ANDROID_PLUGIN_3X_VERSION"
 }
 

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

@@ -5,6 +5,7 @@ import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.api.UnitTestVariant
 import com.android.build.gradle.internal.api.TestedVariant
 import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5JacocoReport
+import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5UnitTest
 import groovy.lang.Closure
 import org.gradle.api.GradleException
 import org.gradle.api.Project
@@ -13,6 +14,8 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.tasks.TaskContainer
+import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
+import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 import org.gradle.util.GradleVersion
 import org.junit.platform.gradle.plugin.EnginesExtension
 import org.junit.platform.gradle.plugin.FiltersExtension
@@ -36,7 +39,10 @@ fun loadProperties(resource: String): Properties {
   return properties
 }
 
-/* Extension Functions */
+/*
+ * "Extension" Extension Functions:
+ * Shorthand properties to access different plugins' extension models.
+ */
 
 val AndroidJUnitPlatformExtension.selectors
   get() = extensionByName<SelectorsExtension>(SELECTORS_EXTENSION_NAME)
@@ -56,6 +62,15 @@ val FiltersExtension.engines
 val AndroidJUnitPlatformExtension.jacoco
   get() = extensionByName<AndroidJUnit5JacocoReport.Extension>(JACOCO_EXTENSION_NAME)
 
+val Project.junit5
+  get() = extensionByName<AndroidJUnitPlatformExtension>(EXTENSION_NAME)
+
+val Project.jacoco
+  get() = extensionByName<JacocoPluginExtension>("jacoco")
+
+val AndroidJUnit5UnitTest.jacoco
+  get() = extensionByName<JacocoTaskExtension>("jacoco")
+
 /* Interoperability layer for Gradle */
 
 /**
@@ -81,7 +96,7 @@ inline fun <reified T> Any.createExtension(
  * Obtain an Extension by name & directly cast it to the expected type.
  */
 @Suppress("UNCHECKED_CAST")
-fun <T> Any.extensionByName(name: String): T {
+private fun <T> Any.extensionByName(name: String): T {
   if (this !is ExtensionAware) {
     throw IllegalArgumentException("Argument is not ExtensionAware: $this")
   }
@@ -93,7 +108,7 @@ fun <T> Any.extensionByName(name: String): T {
  * Log the provided info message using the plugin's Log Tag.
  */
 fun Project.logInfo(text: String) {
-  logger.info("${LOG_TAG}: $text")
+  logger.info("$LOG_TAG: $text")
 }
 
 /**
@@ -157,7 +172,7 @@ fun TaskContainer.maybeCreate(name: String, group: String? = null): Task {
 fun Project.withDependencies(defaults: Properties, config: (Versions) -> Any): Any {
   val versions = Versions(
       project = this,
-      extension = extensionByName(EXTENSION_NAME),
+      extension = project.junit5,
       defaults = defaults)
   return config(versions)
 }

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

@@ -3,9 +3,7 @@ package de.mannodermaus.gradle.plugins.junit5.tasks
 import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.internal.scope.TaskConfigAction
 import com.android.build.gradle.internal.scope.VariantScope
-import de.mannodermaus.gradle.plugins.junit5.AndroidJUnitPlatformExtension
-import de.mannodermaus.gradle.plugins.junit5.EXTENSION_NAME
-import de.mannodermaus.gradle.plugins.junit5.extensionByName
+import de.mannodermaus.gradle.plugins.junit5.junit5
 import de.mannodermaus.gradle.plugins.junit5.variantData
 import org.gradle.api.Project
 import org.gradle.api.Task
@@ -21,5 +19,5 @@ abstract class JUnit5TaskConfigAction<T : Task>(
 
   protected val variant: BaseVariant = testTask.variant
   protected val scope: VariantScope = variant.variantData.scope
-  protected val junit5 = project.extensionByName<AndroidJUnitPlatformExtension>(EXTENSION_NAME)
+  protected val junit5 = project.junit5
 }

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

@@ -1,12 +1,9 @@
 package de.mannodermaus.gradle.plugins.junit5.tasks
 
-import de.mannodermaus.gradle.plugins.junit5.JACOCO_EXTENSION_NAME
-import de.mannodermaus.gradle.plugins.junit5.extensionByName
+import de.mannodermaus.gradle.plugins.junit5.jacoco
 import de.mannodermaus.gradle.plugins.junit5.logInfo
 import de.mannodermaus.gradle.plugins.junit5.maybeCreate
 import org.gradle.api.Project
-import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
-import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 import org.gradle.testing.jacoco.tasks.JacocoReport
 
 private const val TASK_NAME_DEFAULT = "jacocoTestReport"
@@ -53,15 +50,15 @@ open class AndroidJUnit5JacocoReport : JacocoReport() {
 
     override fun execute(reportTask: AndroidJUnit5JacocoReport) {
       // Project-level configuration
-      val projectJacoco = project.extensionByName<JacocoPluginExtension>(JACOCO_PLUGIN_EXT)
+      val projectJacoco = project.jacoco
       projectJacoco.applyTo(testTask)
       reportTask.dependsOn(testTask)
       reportTask.group = GROUP_REPORTING
       reportTask.description = "Generates Jacoco coverage reports " +
           "for the ${variant.name.capitalize()} variant."
 
       // Task-level Configuration
-      val taskJacoco = testTask.extensionByName<JacocoTaskExtension>(JACOCO_TASK_EXT)
+      val taskJacoco = testTask.jacoco
       reportTask.executionData = project.files(taskJacoco.destinationFile.path)
       reportTask.classDirectories = project.files(scope.javaOutputDir)
       reportTask.sourceDirectories = project.files(variant.sourceSets
@@ -70,9 +67,7 @@ open class AndroidJUnit5JacocoReport : JacocoReport() {
           .map { it.path })
 
       // Apply JUnit 5 configuration parameters
-      val junit5Jacoco = junit5
-          .extensionByName<AndroidJUnit5JacocoReport.Extension>(JACOCO_EXTENSION_NAME)
-
+      val junit5Jacoco = junit5.jacoco
       reportTask.reports.apply {
         csv.isEnabled = junit5Jacoco.csvReport
         html.isEnabled = junit5Jacoco.htmlReport

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

@@ -36,6 +36,5 @@ open class AndroidJUnit5CopyKotlin : Copy() {
 
       testTask.dependsOn(copyTask)
     }
-
   }
 }

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

@@ -6,13 +6,12 @@ import com.android.build.gradle.internal.scope.VariantScope
 import com.android.build.gradle.tasks.factory.AndroidUnitTest
 import com.android.builder.core.VariantType
 import de.mannodermaus.gradle.plugins.junit5.AndroidJUnitPlatformExtension
-import de.mannodermaus.gradle.plugins.junit5.EXTENSION_NAME
 import de.mannodermaus.gradle.plugins.junit5.engines
-import de.mannodermaus.gradle.plugins.junit5.extensionByName
 import de.mannodermaus.gradle.plugins.junit5.filters
 import de.mannodermaus.gradle.plugins.junit5.getExcludeClassNamePatterns
 import de.mannodermaus.gradle.plugins.junit5.getIncludeClassNamePatterns
 import de.mannodermaus.gradle.plugins.junit5.isEmpty
+import de.mannodermaus.gradle.plugins.junit5.junit5
 import de.mannodermaus.gradle.plugins.junit5.logInfo
 import de.mannodermaus.gradle.plugins.junit5.packages
 import de.mannodermaus.gradle.plugins.junit5.selectors
@@ -80,7 +79,7 @@ open class AndroidJUnit5UnitTest : JavaExec() {
           "for the ${variant.name.capitalize()} variant."
 
       // JUnit 5 properties configuration
-      val junit5 = project.extensionByName<AndroidJUnitPlatformExtension>(EXTENSION_NAME)
+      val junit5 = project.junit5
       configureTaskInputs(task, junit5)
       configureTaskDependencies(task, junit5)
       val reportsDir = configureTaskOutputs(task, junit5)

sample/build.gradle

@@ -1,3 +1,5 @@
+import com.android.build.gradle.BaseExtension
+
 buildscript {
   repositories {
     jcenter()
@@ -13,6 +15,20 @@ apply plugin: "kotlin-android"
 apply plugin: "de.mannodermaus.android-junit5"
 apply plugin: "jacoco"
 
+project.afterEvaluate {
+
+  def mi = BaseExtension.class.getDeclaredField("extraModelInfo")
+  mi.accessible = true
+
+  def val = mi.get(android)
+  println "Extra Model Info: $val"
+
+  val.class.getDeclaredFields().each {
+    it.accessible = true
+    println " |__ $it --> ${it.get(val)}"
+  }
+}
+
 android {
   // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   // A Note to my forgetful self:
@@ -52,3 +68,8 @@ dependencies {
   testImplementation junit5Params()
   testCompileOnly junit5EmbeddedRuntime()
 }
+
+project.afterEvaluate {
+//  tasks.getByName("copyKotlinUnitTestClassesDebug").enabled = false
+//  tasks.getByName("junitPlatformTestDebug").enabled = false
+}