Refactor dependencies in build.gradle.kts and libs.versions.toml for consistency

Author: MattBDev

build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts

@@ -1,5 +1,4 @@
 import buildlogic.stringyLibs
-import buildlogic.getVersion
 
 plugins {
     `java-library`
@@ -25,9 +24,20 @@ repositories {
 }
 
 dependencies {
-    "implementation"(project(":worldedit-bukkit"))
+    implementation(project(":worldedit-bukkit"))
+    constraints {
+        //Reduces the amount of libraries Gradle and IntelliJ need to resolve
+        implementation("net.kyori:adventure-bom") {
+            version { strictly("4.24.0") }
+            because("Ensure a consistent version of adventure is used.")
+        }
+    }
 }
 
 tasks.named("assemble") {
     dependsOn("reobfJar")
 }
+
+tasks.named<Javadoc>("javadoc") {
+    enabled = false
+}

build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts

@@ -4,7 +4,6 @@ import buildlogic.getLibrary
 plugins {
     id("eclipse")
     id("idea")
-//    id("checkstyle")
     id("buildlogic.common")
 }
 
@@ -21,15 +20,9 @@ tasks
         options.isDeprecation = true
         options.encoding = "UTF-8"
         options.compilerArgs.add("-parameters")
-        options.compilerArgs.add("-Werror")
         options.compilerArgs.add("--add-modules=jdk.incubator.vector")
     }
 
-//configure<CheckstyleExtension> {
-//    configFile = rootProject.file("config/checkstyle/checkstyle.xml")
-//    toolVersion = "10.16.0"
-//}
-
 tasks.withType<Test>().configureEach {
     useJUnitPlatform {
         includeEngines("junit-jupiter", "jqwik")
@@ -46,6 +39,7 @@ dependencies {
     "testImplementation"(stringyLibs.getLibrary("mockito-core"))
     "testImplementation"(stringyLibs.getLibrary("mockito-junit-jupiter"))
     "testRuntimeOnly"(stringyLibs.getLibrary("junit-jupiter-engine"))
+    "testRuntimeOnly"(stringyLibs.getLibrary("junit-platform-launcher"))
 }
 
 // Java 8 turns on doclint which we fail
@@ -54,9 +48,6 @@ tasks.withType<Javadoc>().configureEach {
     (options as StandardJavadocDocletOptions).apply {
         addStringOption("Xdoclint:none", "-quiet")
         addStringOption("-add-modules", "jdk.incubator.vector")
-
-        //addBooleanOption("Werror", true)
-        //addBooleanOption("Xdoclint:all", true)
         addBooleanOption("Xdoclint:-missing", true)
         tags(
             "apiNote:a:API Note:",
@@ -77,14 +68,4 @@ tasks.withType<Javadoc>().configureEach {
 configure<JavaPluginExtension> {
     withJavadocJar()
     withSourcesJar()
-//TODO Migrated from CommonJavaConfig.kt
-//    disableAutoTargetJvm()
-//    withJavadocJar()
-//    if (sourcesJar) {
-//        withSourcesJar()
-//    }
-}
-
-tasks.named("check").configure {
-    dependsOn("checkstyleMain", "checkstyleTest")
 }

build-logic/src/main/kotlin/buildlogic.core-and-platform.gradle.kts

@@ -5,16 +5,7 @@ plugins {
     id("signing")
 }
 
-if (project.hasProperty("buildnumber")) {
-    ext["internalVersion"] = "$version;${rootProject.ext["gitCommitHash"]}"
-} else {
-    ext["internalVersion"] = "$version"
-}
-
-//TODO Check to see if still needed since this was migrated from PlatformConfig.kt
-//if (name in setOf("worldedit-core", "worldedit-bukkit", "worldedit-cli")) {
-//    the<JavaPluginExtension>().withSourcesJar()
-//}
+ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
 
 val publishingExtension = the<PublishingExtension>()
 

build-logic/src/main/kotlin/buildlogic.libs.gradle.kts

@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.apply
@@ -37,7 +38,7 @@ val relocations = mapOf(
         "net.kyori.minecraft" to "com.sk89q.worldedit.util.kyori",
 )
 
-tasks.register<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("jar") {
+tasks.register<ShadowJar>("jar") {
     configurations = listOf(project.configurations["shade"])
     archiveClassifier.set("")
 
@@ -117,7 +118,8 @@ tasks.register<Jar>("javadocJar") {
 }
 
 tasks.named("assemble").configure {
-    dependsOn("jar", "sourcesJar")
+    dependsOn(tasks.named("jar"))
+    dependsOn(tasks.named("sourcesJar"))
 }
 
 project.apply<LibsConfigPluginHack>()

build-logic/src/main/kotlin/buildlogic.platform.gradle.kts

@@ -1,5 +1,6 @@
 import buildlogic.getLibrary
 import buildlogic.stringyLibs
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("com.gradleup.shadow")
@@ -10,7 +11,7 @@ val platform = extensions.create<buildlogic.PlatformExtension>("platform")
 platform.includeClasspath.convention(false)
 platform.extraAttributes.convention(mapOf())
 
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+tasks.named<ShadowJar>("shadowJar") {
     archiveClassifier.set("dist")
     relocate("com.sk89q.jchronic", "com.sk89q.worldedit.jchronic")
     val jchronic = stringyLibs.getLibrary("jchronic").get()
@@ -36,7 +37,6 @@ javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElement
     skip()
 }
 
-afterEvaluate {
     tasks.named<Jar>("jar") {
         val kind = platform.kind.get()
         val includeClasspath = platform.includeClasspath.get()
@@ -59,4 +59,3 @@ afterEvaluate {
         attributes.putAll(extraAttributes)
         manifest.attributes(attributes)
     }
-}

gradle.properties

@@ -5,6 +5,8 @@ org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.vfs.watch=true
+org.gradle.caching=true
 
 loom_fabric_repository=https://maven.enginehub.org/artifactory/fabricmc/
 loom_libraries_base=https://maven.enginehub.org/artifactory/minecraft/
+

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Minecraft expectations
-paper = "1.21-R0.1-SNAPSHOT"
+paperApi = "1.21-R0.1-SNAPSHOT"
 fastutil = "8.5.15"
 guava = "33.3.1-jre"
 log4j = "2.24.1"
@@ -35,11 +35,12 @@ jchronic = "0.2.4a"
 lz4-java = "1.8.0"
 lz4-stream = "1.0.0"
 commons-cli = "1.10.0"
-paperlib = "1.0.8"
+paperLib = "1.0.8"
 paster = "1.1.7"
 vault = "1.7.1"
 serverlib = "2.3.7"
 linbus = "0.2.0"
+autoService = "1.1.1"
 ## Internal
 text-adapter = "3.0.6"
 text = "3.0.4"
@@ -53,7 +54,7 @@ junit = "5.11.1"
 pluginyml = "0.6.0"
 mod-publish-plugin = "0.8.4"
 grgit = "5.3.2"
-shadow = "9.0.1"
+shadow = "9.0.2"
 paperweight = "2.0.0-SNAPSHOT"
 codecov = "0.2.0"
 
@@ -73,7 +74,7 @@ shadow = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version
 paperweight = { group = "io.papermc.paperweight.userdev", name = "io.papermc.paperweight.userdev.gradle.plugin", version.ref = "paperweight" }
 
 # Minecraft expectations
-paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
+paperApi = { group = "io.papermc.paper", name = "paper-api", version.ref = "paperApi" }
 fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
 log4j-bom = { group = "org.apache.logging.log4j", name = "log4j-bom", version.ref = "log4j" }
 log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
@@ -110,7 +111,7 @@ jchronic = { group = "com.sk89q", name = "jchronic", version.ref = "jchronic" }
 lz4Java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4-java" }
 lz4JavaStream = { group = "net.jpountz", name = "lz4-java-stream", version.ref = "lz4-stream" }
 commonsCli = { group = "commons-cli", name = "commons-cli", version.ref = "commons-cli" }
-paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }
+paperLib = { group = "io.papermc", name = "paperlib", version.ref = "paperLib" }
 adventureApi = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
 adventureMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
 adventureBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-bukkit" }
@@ -119,6 +120,8 @@ vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault
 serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
 checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
 
+autoService = { group = "com.google.auto.service", name = "auto-service", version.ref = "autoService" }
+
 linBus-bom = { group = "org.enginehub.lin-bus", name = "lin-bus-bom", version.ref = "linbus" }
 linBus-common = { group = "org.enginehub.lin-bus", name = "lin-bus-common" }
 linBus-stream = { group = "org.enginehub.lin-bus", name = "lin-bus-stream" }
@@ -137,6 +140,7 @@ junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
 junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
 junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params" }
 junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" }
 
 jqwik = { group = "net.jqwik", name = "jqwik", version.ref = "jqwik" }