dorkbox/GradleUtils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed kotlin test

Browse Source
This commit is contained in:
Robinson 2021-04-17 02:14:16 +02:00
parent 333732e1a4
commit 1300cac992
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/dorkbox/gradle/StaticMethodsAndTools.kt
View File

@ -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))
}
}