Properly apply java, java-library, and idea plugins in addition to this one

master
Robinson 2023-01-22 20:19:02 +01:00
parent f65cb78e0d
commit 93b65da5a0
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
3 changed files with 5 additions and 8 deletions

View File

@ -34,7 +34,7 @@ object Extras {
// set for the project
const val description = "Gradle Plugin to manage various Gradle tasks, such as updating gradle and dependencies"
const val group = "com.dorkbox"
const val version = "3.8"
const val version = "3.9"
// set as project.ext
const val name = "Gradle Utils"

View File

@ -22,9 +22,7 @@ import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import java.io.*
import java.net.URL
import java.util.jar.JarEntry
import java.util.jar.JarFile
import java.util.jar.JarOutputStream
import java.util.jar.*
/**
@ -48,6 +46,9 @@ class GradleUtils : Plugin<Project> {
throw GradleException("${project.name}: Gradle ${project.gradle.gradleVersion} requires Gradle 7.0+ to continue.")
}
StaticMethodsAndTools.apply(project, "java")
StaticMethodsAndTools.apply(project, "java-library")
StaticMethodsAndTools.apply(project, "idea")
println("\t${project.name}: Gradle ${project.gradle.gradleVersion}, Java ${JavaVersion.current()}")

View File

@ -113,10 +113,6 @@ open class StaticMethodsAndTools(private val project: Project) {
// this is lazy, because it MUST be run from a task!
val hasKotlin: Boolean by lazy { hasKotlin(project) }
init {
apply(project, "idea")
}
/**
* Maps the property (key/value) pairs of a property file onto the specified target object. Also maps fields in the targetObject to the
* project, if they have the same name relationship (ie: field name is "version", project method is "setVersion")