From 1300cac99244ec9be5717ae6354e9068b22233c7 Mon Sep 17 00:00:00 2001
From: Robinson <robinson@dorkbox.com>
Date: Sat, 17 Apr 2021 02:14:16 +0200
Subject: [PATCH] Fixed kotlin test

---
 src/dorkbox/gradle/StaticMethodsAndTools.kt | 27 +++++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/dorkbox/gradle/StaticMethodsAndTools.kt b/src/dorkbox/gradle/StaticMethodsAndTools.kt
index f20af6a..0f2c046 100644
--- a/src/dorkbox/gradle/StaticMethodsAndTools.kt
+++ b/src/dorkbox/gradle/StaticMethodsAndTools.kt
@@ -15,6 +15,8 @@
  */
 package dorkbox.gradle
 
+import dorkbox.gradle.deps.DependencyScanner
+import dorkbox.gradle.jpms.SourceSetContainer2
 import org.gradle.api.GradleException
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
@@ -377,15 +379,9 @@ open class StaticMethodsAndTools(private val project: Project) {
         test.resources.setSrcDirs(project.files("testResources"))
 
         // If kotlin is not used, we should not use the kotlin tasks
-        val hasKotlinFiles = try {
-            val kotlin = (main as org.gradle.api.internal.HasConvention).convention.getPlugin(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class.java).kotlin
+        val hasKotlin = project.projectDir.walkTopDown().find { it.extension == "kt" }?.exists() ?: false // is there kotlin?
 
-            kotlin.files.firstOrNull { it.name.endsWith(".kt") } != null
-        } catch (e: Exception) {
-            false
-        }
-
-        if (hasKotlinFiles) {
+        if (hasKotlin) {
             (main as org.gradle.api.internal.HasConvention).convention
                 .getPlugin(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class.java).kotlin.apply {
                     setSrcDirs(project.files("src"))
@@ -574,4 +570,19 @@ open class StaticMethodsAndTools(private val project: Project) {
             project.pluginManager.apply(id)
         }
     }
+
+
+    /**
+     * Load JPMS for a specific java version using the default configuration
+     */
+    fun jpms(javaVersion: JavaVersion) {
+        SourceSetContainer2(javaVersion, project)
+    }
+
+    /**
+     * Load and configure JPMS for a specific java version
+     */
+    fun jpms(javaVersion: JavaVersion, block: SourceSetContainer2.() -> Unit) {
+        block(SourceSetContainer2(javaVersion, project))
+    }
 }