Fixed kotlin test
This commit is contained in:
parent
333732e1a4
commit
1300cac992
@ -15,6 +15,8 @@
|
|||||||
*/
|
*/
|
||||||
package dorkbox.gradle
|
package dorkbox.gradle
|
||||||
|
|
||||||
|
import dorkbox.gradle.deps.DependencyScanner
|
||||||
|
import dorkbox.gradle.jpms.SourceSetContainer2
|
||||||
import org.gradle.api.GradleException
|
import org.gradle.api.GradleException
|
||||||
import org.gradle.api.JavaVersion
|
import org.gradle.api.JavaVersion
|
||||||
import org.gradle.api.Plugin
|
import org.gradle.api.Plugin
|
||||||
@ -377,15 +379,9 @@ open class StaticMethodsAndTools(private val project: Project) {
|
|||||||
test.resources.setSrcDirs(project.files("testResources"))
|
test.resources.setSrcDirs(project.files("testResources"))
|
||||||
|
|
||||||
// If kotlin is not used, we should not use the kotlin tasks
|
// If kotlin is not used, we should not use the kotlin tasks
|
||||||
val hasKotlinFiles = try {
|
val hasKotlin = project.projectDir.walkTopDown().find { it.extension == "kt" }?.exists() ?: false // is there kotlin?
|
||||||
val kotlin = (main as org.gradle.api.internal.HasConvention).convention.getPlugin(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class.java).kotlin
|
|
||||||
|
|
||||||
kotlin.files.firstOrNull { it.name.endsWith(".kt") } != null
|
if (hasKotlin) {
|
||||||
} catch (e: Exception) {
|
|
||||||
false
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasKotlinFiles) {
|
|
||||||
(main as org.gradle.api.internal.HasConvention).convention
|
(main as org.gradle.api.internal.HasConvention).convention
|
||||||
.getPlugin(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class.java).kotlin.apply {
|
.getPlugin(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class.java).kotlin.apply {
|
||||||
setSrcDirs(project.files("src"))
|
setSrcDirs(project.files("src"))
|
||||||
@ -574,4 +570,19 @@ open class StaticMethodsAndTools(private val project: Project) {
|
|||||||
project.pluginManager.apply(id)
|
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))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user