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

updated gradle + kotlin. updated deps

This commit is contained in:
Robinson 2021-09-11 02:01:32 +02:00
parent 578dbd78f9
commit a8ca1063d8
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle.kts
View File

@ -22,20 +22,20 @@ plugins {
java
`java-gradle-plugin`
id("com.gradle.plugin-publish") version "0.14.0"
id("com.gradle.plugin-publish") version "0.15.0"
id("com.dorkbox.Licensing") version "2.6"
id("com.dorkbox.Licensing") version "2.9.2"
id("com.dorkbox.VersionUpdate") version "2.4"
id("com.dorkbox.GradleUtils") version "2.5"
id("com.dorkbox.GradleUtils") version "2.10"
kotlin("jvm") version "1.4.32"
kotlin("jvm") version "1.5.21"
}
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 = "2.9"
const val version = "2.10"
// set as project.ext
const val name = "Gradle Utils"

16
src/dorkbox/gradle/jpms/JavaXConfiguration.kt
View File

@ -39,7 +39,7 @@ import java.io.File
//target/classes-java9 .
@Suppress("MemberVisibilityCanBePrivate")
class JavaXConfiguration(javaVersion: JavaVersion, private val project: Project, private val gradleUtils: StaticMethodsAndTools) {
class JavaXConfiguration(javaVersion: JavaVersion, private val project: Project, gradleUtils: StaticMethodsAndTools) {
val ver: String = javaVersion.majorVersion
// this cannot be ONLY a number, there must be something else -- intellij will *not* pickup the name if it's only a number
@ -275,16 +275,16 @@ class JavaXConfiguration(javaVersion: JavaVersion, private val project: Project,
inputs.property("moduleName", moduleName)
destinationDir = compileMainXJava.destinationDir
destinationDirectory.set(compileMainXJava.destinationDirectory.asFile.orNull)
classpath = this@JavaXConfiguration.project.files() // this resets the classpath. we use the module-path instead!
// modules require this!
doFirst {
val allCompiled = if (hasKotlin) {
proj.files(compileMainJava.destinationDir, compileMainKotlin.destinationDir)
proj.files(compileMainJava.destinationDirectory.asFile.orNull, compileMainKotlin.destinationDirectory.asFile.orNull)
} else {
proj.files(compileMainJava.destinationDir)
proj.files(compileMainJava.destinationDirectory.asFile.orNull)
}
// the SOURCE of the module-info.java file. It uses **EVERYTHING**
@ -301,8 +301,10 @@ class JavaXConfiguration(javaVersion: JavaVersion, private val project: Project,
val intellijClasses = File("${this@JavaXConfiguration.project.buildDir}/classes-intellij")
if (intellijClasses.exists()) {
// copy everything to intellij also. FORTUNATELY, we know it's only going to be the `module-info` and `package-info` classes!
val moduleInfo = destinationDir.walkTopDown().filter { it.name == "module-info.class" }.toList()
val packageInfo = destinationDir.walkTopDown().filter { it.name == "package-info.class" }.toList()
val directory = destinationDirectory.asFile.get()
val moduleInfo = directory.walkTopDown().filter { it.name == "module-info.class" }.toList()
val packageInfo = directory.walkTopDown().filter { it.name == "package-info.class" }.toList()
val name = when {
moduleInfo.isNotEmpty() && packageInfo.isNotEmpty() -> "module-info and package-info"
@ -313,7 +315,7 @@ class JavaXConfiguration(javaVersion: JavaVersion, private val project: Project,
println("\tCopying $name files into the intellij classes location...")
moduleInfo.forEach {
val newLocation = File(intellijClasses, it.relativeTo(destinationDir).path)
val newLocation = File(intellijClasses, it.relativeTo(directory).path)
it.copyTo(newLocation, overwrite = true)
}
}