Remove dependency on deprecated junit-platform-gradle-plugin by migrating Extensions to Kotlin (#69)

Author: Marcel Schnelle

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

@@ -1,6 +1,9 @@
 package de.mannodermaus.gradle.plugins.junit5
 
 import com.android.build.gradle.api.BaseVariant
+import de.mannodermaus.gradle.plugins.junit5.internal.ConfigurationKind
+import de.mannodermaus.gradle.plugins.junit5.internal.ConfigurationScope
+import de.mannodermaus.gradle.plugins.junit5.internal.find
 import org.assertj.core.api.Assertions.assertThat
 import org.gradle.api.artifacts.Configuration
 import org.jetbrains.spek.api.Spek
@@ -17,7 +20,7 @@ import org.mockito.Mockito
  */
 class ExtensionSpec : Spek({
 
-  describe("tests for ConfigurationContainer#findConfiguration()") {
+  describe("tests for ConfigurationContainer#find()") {
 
     // Quick-hand mock creator for Configurations
     fun mockConfiguration(name: String): Configuration =
@@ -137,7 +140,7 @@ class ExtensionSpec : Spek({
             pairs.forEach { (kind, expected) ->
 
               it("finds configuration '${expected.name}' for kind == $kind") {
-                assertThat(container.findConfiguration(
+                assertThat(container.find(
                     variant = variant,
                     kind = kind,
                     scope = scope))

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

@@ -2,8 +2,10 @@
 
 package de.mannodermaus.gradle.plugins.junit5
 
-import de.mannodermaus.gradle.plugins.junit5.ConfigurationKind.ANDROID_TEST
-import de.mannodermaus.gradle.plugins.junit5.ConfigurationScope.RUNTIME_ONLY
+import de.mannodermaus.gradle.plugins.junit5.internal.ConfigurationKind.ANDROID_TEST
+import de.mannodermaus.gradle.plugins.junit5.internal.ConfigurationScope.RUNTIME_ONLY
+import de.mannodermaus.gradle.plugins.junit5.internal.android
+import de.mannodermaus.gradle.plugins.junit5.internal.find
 import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5JacocoReport
 import de.mannodermaus.gradle.plugins.junit5.tasks.AndroidJUnit5UnitTest
 import de.mannodermaus.gradle.plugins.junit5.util.TestEnvironment
@@ -259,7 +261,7 @@ class PluginSpec : Spek({
         }
 
         it("automatically includes instrumentation-test-runner at runtime") {
-          val androidTestRuntimeOnly = project.configurations.findConfiguration(
+          val androidTestRuntimeOnly = project.configurations.find(
               kind = ANDROID_TEST, scope = RUNTIME_ONLY)
 
           assertThat(androidTestRuntimeOnly.dependencies
@@ -679,7 +681,7 @@ class PluginSpec : Spek({
             on("replacing class rules") {
               project.android.testOptions.junitPlatform {
                 jacocoOptions {
-                  excludedClasses = emptyList()
+                  excludedClasses = mutableListOf()
                 }
               }
 

android-junit5/build.gradle

@@ -75,13 +75,14 @@ task test(overwrite: true) {}
 
 dependencies {
   // Language Support
-  compile gradleApi()
-  compile "org.codehaus.groovy:groovy:$GROOVY_VERSION"
-  compile "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
+  implementation gradleApi()
+  implementation "org.codehaus.groovy:groovy:$GROOVY_VERSION"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
 
   // Dependent Plugins
-  compile "org.junit.platform:junit-platform-gradle-plugin:$JUNIT_PLATFORM_VERSION"
-  compile "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
+  implementation "org.junit.platform:junit-platform-console:$JUNIT_PLATFORM_VERSION"
+  implementation "org.junit.platform:junit-platform-commons:$JUNIT_PLATFORM_VERSION"
+  implementation "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
   compileOnly "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
 }