Update sample & tests to use the new dependency handlers

Author: mannodermaus

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

@@ -31,8 +31,8 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
                 '}'
     }
 
-    private static final String JUNITJUPITER_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitJupiter", "junitPlatform")
-    private static final String JUNITPARAMS_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitParams", "junitJupiterParams")
+    private static final String JUNITJUPITER_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitJupiter", "junit5")
+    private static final String JUNITPARAMS_DEPENDENCY_WARNING = dependencyDeprecationWarning("junitParams", "junit5Params")
 
     /**
      * This method doesn't call through to super.apply().
@@ -79,7 +79,7 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
         }
 
         // Configure dependency handlers
-        project.dependencies.ext.junitPlatform = {
+        project.dependencies.ext.junit5 = {
             def jupiterVersion = junitExtension.jupiterVersion
             def platformVersion = junitExtension.platformVersion
             def vintageVersion = junitExtension.vintageVersion
@@ -98,7 +98,7 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
             ]
         }
 
-        project.dependencies.ext.junitJupiterParams = {
+        project.dependencies.ext.junit5Params = {
             def jupiterVersion = junitExtension.jupiterVersion
 
             return project.dependencies.create("org.junit.jupiter:junit-jupiter-params:${jupiterVersion}")
@@ -107,12 +107,12 @@ class AndroidJUnitPlatformPlugin implements Plugin<Project> {
         // Add deprecated dependency handlers
         project.dependencies.ext.junitJupiter = {
             project.logger.warn(JUNITJUPITER_DEPENDENCY_WARNING)
-            return project.dependencies.ext.junitPlatform()
+            return project.dependencies.ext.junit5()
         }
 
         project.dependencies.ext.junitParams = {
             project.logger.warn(JUNITPARAMS_DEPENDENCY_WARNING)
-            return project.dependencies.ext.junitJupiterParams()
+            return project.dependencies.ext.junit5Params()
         }
 
         project.afterEvaluate {

android-junit5/src/test/groovy/de/mannodermaus/gradle/plugins/android_junit5/AndroidJUnitPlatformSpec.groovy

@@ -295,7 +295,7 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
         }
         p.dependencies {
             // "testCompile" or "testApi"
-            invokeMethod(testCompileDependencyName(), junitJupiter())
+            invokeMethod(testCompileDependencyName(), junit5())
         }
 
         then:

sample/build.gradle

@@ -9,10 +9,16 @@ buildscript {
 
     dependencies {
         //noinspection GradleDynamicVersion
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:+"
+        classpath ("de.mannodermaus.gradle.plugins:android-junit5:1.0.0-RC3-rev1-SNAPSHOT") {
+            changing = true
+        }
         classpath "com.android.tools.build:gradle:$ANDROID_PLUGIN_3X_VERSION"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
+
+    configurations.classpath {
+        resolutionStrategy.cacheChangingModulesFor 5, "minutes"
+    }
 }
 
 apply plugin: "com.android.application"
@@ -51,8 +57,8 @@ android {
 dependencies {
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    testImplementation junitJupiter()
-    testImplementation junitParams()
+    testImplementation junit5()
+    testImplementation junit5Params()
 }
 
 // IJ doesn't recognize Kotlin test classes properly,