Updated Kotlin & plugin versions

Author: mannodermaus

.idea/runConfigurations/Sample__Run_Unit_Tests.xml

@@ -67,8 +67,8 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
     /* Abstract */
 
     protected abstract String testCompileDependency()
-    protected abstract String testRuntimeDependency()
 
+    protected abstract String testRuntimeDependency()
 
     /* Test Cases */
 
@@ -243,7 +243,7 @@ abstract class AndroidJUnitPlatformSpec extends Specification {
         p.tasks.getByName("junitPlatformTestPaidRelease")
     }
 
-    @IgnoreIf({AndroidJUnitPlatformSpec.isAgp3x()})
+    @IgnoreIf({ AndroidJUnitPlatformSpec.isAgp3x() })
     def "custom junit jupiter version"() {
         when:
         def nonExistentVersion = "0.0.0"

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

@@ -13,7 +13,7 @@ VCS_URL                                     = https://github.com/aurae/android-j
 
 # Dependency versions (plugins)
 ANDROID_PLUGIN_VERSION_2X                   = 2.3.2
-ANDROID_PLUGIN_VERSION_3X                   = 3.0.0-alpha9
+ANDROID_PLUGIN_VERSION_3X                   = 3.0.0-beta2
 BINTRAY_PLUGIN_VERSION                      = 1.7.3
 
 # Dependency versions

gradle.properties

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = "1.1.3-2"
+    ext.kotlinVersion = "1.1.4-2"
 
     repositories {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
@@ -21,7 +21,7 @@ apply plugin: "de.mannodermaus.android-junit5"
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion "26.0.1"
 
     defaultConfig {
         applicationId "de.mannodermaus.gradle.plugins.android_junit5.sample"
@@ -47,3 +47,19 @@ dependencies {
     testImplementation junitJupiter()
     testImplementation junitParams()
 }
+
+// IJ doesn't recognize Kotlin test classes properly,
+// so we copy them over manually
+
+afterEvaluate {
+    android.buildTypes.all {
+        def name = it.name
+
+        def copyTask = project.task(type: Copy, "copyKotlin${name.capitalize()}UnitTestClasses") {
+            from "build/tmp/kotlin-classes/${name}UnitTest"
+            into "build/intermediates/classes/test/$name"
+        }
+
+        project.tasks.getByName("assemble${name.capitalize()}UnitTest").dependsOn copyTask
+    }
+}

sample/build.gradle

@@ -1,6 +1,20 @@
-import org.junit.jupiter.api.*
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions.assertAll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.DynamicTest
 import org.junit.jupiter.api.DynamicTest.dynamicTest
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Tag
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestFactory
+import org.junit.jupiter.api.TestInfo
 import org.junit.jupiter.api.function.Executable
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource