Update build-logic, allowing Gradle 9

me4502 · me4502 · commit 169b1a0d1b42 · 2025-12-29T21:48:15.000+10:00
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -12,8 +12,7 @@ repositories {
 
 dependencies {
     implementation(gradleApi())
-    implementation(libs.licenser)
-    implementation(libs.grgit)
+    implementation(libs.levelHeadered)
     implementation(libs.shadow)
     implementation(libs.jfrog.buildinfo)
     implementation(libs.paperweight)
diff --git a/build-logic/src/main/kotlin/buildlogic.artifactory-root.gradle.kts b/build-logic/src/main/kotlin/buildlogic.artifactory-root.gradle.kts
@@ -1,3 +1,6 @@
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.named
 import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
 import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
 
diff --git a/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts
@@ -1,5 +1,5 @@
-import buildlogic.getLibrary
 import buildlogic.stringyLibs
+import buildlogic.getLibrary
 
 plugins {
     id("eclipse")
@@ -8,9 +8,6 @@ plugins {
     id("buildlogic.common")
 }
 
-val commonJava = extensions.create<buildlogic.CommonJavaExtension>("commonJava")
-commonJava.banSlf4j.convention(true)
-
 tasks
     .withType<JavaCompile>()
     .matching { it.name == "compileJava" || it.name == "compileTestJava" }
@@ -23,7 +20,7 @@ tasks
         options.isDeprecation = true
         options.encoding = "UTF-8"
         options.compilerArgs.add("-parameters")
-        //options.compilerArgs.add("-Werror")
+//        options.compilerArgs.add("-Werror")
     }
 
 configure<CheckstyleExtension> {
@@ -32,7 +29,9 @@ configure<CheckstyleExtension> {
 }
 
 tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
+    useJUnitPlatform {
+        includeEngines("junit-jupiter")
+    }
 }
 
 dependencies {
@@ -44,13 +43,14 @@ 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
 tasks.withType<Javadoc>().configureEach {
     options.encoding = "UTF-8"
     (options as StandardJavadocDocletOptions).apply {
-        //addBooleanOption("Werror", true)
+//        addBooleanOption("Werror", true)
         addBooleanOption("Xdoclint:all", true)
         addBooleanOption("Xdoclint:-missing", true)
         tags(
@@ -66,16 +66,6 @@ configure<JavaPluginExtension> {
     withSourcesJar()
 }
 
-configurations["compileClasspath"].apply {
-    resolutionStrategy.componentSelection {
-        withModule("org.slf4j:slf4j-api") {
-            if (commonJava.banSlf4j.get()) {
-                reject("No SLF4J allowed on compile classpath")
-            }
-        }
-    }
-}
-
 tasks.named("check").configure {
     dependsOn("checkstyleMain", "checkstyleTest")
 }
diff --git a/build-logic/src/main/kotlin/buildlogic.common.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common.gradle.kts
@@ -3,7 +3,7 @@ import buildlogic.stringyLibs
 import org.gradle.plugins.ide.idea.model.IdeaModel
 
 plugins {
-    id("org.cadixdev.licenser")
+    id("net.octyl.level-headered")
 }
 
 group = rootProject.group
@@ -53,10 +53,14 @@ dependencies {
     }
 }
 
-license {
-    header(rootProject.file("HEADER.txt"))
-    include("**/*.java")
-    include("**/*.kt")
+levelHeadered {
+    headerTemplate(rootProject.file("HEADER.txt"))
+
+    sourceMatchPatterns {
+        // Exclude overrides for shaded libs
+        exclude("org/enginehub/craftbook/util/jinglenote/")
+        exclude("org/enginehub/craftbook/util/profile/")
+    }
 }
 
 plugins.withId("idea") {
diff --git a/build-logic/src/main/kotlin/buildlogic.core-and-platform.gradle.kts b/build-logic/src/main/kotlin/buildlogic.core-and-platform.gradle.kts
@@ -5,8 +5,6 @@ plugins {
     id("buildlogic.artifactory-sub")
 }
 
-ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
-
 publishing {
     publications {
         register<MavenPublication>("maven") {
diff --git a/build-logic/src/main/kotlin/buildlogic.libs.gradle.kts b/build-logic/src/main/kotlin/buildlogic.libs.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java-base")
     id("maven-publish")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
     id("com.jfrog.artifactory")
     id("buildlogic.common")
     id("buildlogic.artifactory-sub")
@@ -114,7 +114,6 @@ project.apply<LibsConfigPluginHack>()
 val libsComponent = project.components["libs"] as AdhocComponentWithVariants
 
 val apiElements = project.configurations.register("apiElements") {
-    isVisible = false
     description = "API elements for libs"
     isCanBeResolved = false
     isCanBeConsumed = true
@@ -129,7 +128,6 @@ val apiElements = project.configurations.register("apiElements") {
 }
 
 val runtimeElements = project.configurations.register("runtimeElements") {
-    isVisible = false
     description = "Runtime elements for libs"
     isCanBeResolved = false
     isCanBeConsumed = true
@@ -144,7 +142,6 @@ val runtimeElements = project.configurations.register("runtimeElements") {
 }
 
 val sourcesElements = project.configurations.register("sourcesElements") {
-    isVisible = false
     description = "Source elements for libs"
     isCanBeResolved = false
     isCanBeConsumed = true
@@ -176,8 +173,3 @@ configure<PublishingExtension> {
         }
     }
 }
-
-if (project != project(":craftbook-libs:core")) {
-    evaluationDependsOn(":craftbook-libs:core")
-    configurations["shade"].shouldResolveConsistentlyWith(project(":craftbook-libs:core").configurations["shade"])
-}
diff --git a/build-logic/src/main/kotlin/buildlogic.platform.gradle.kts b/build-logic/src/main/kotlin/buildlogic.platform.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
     id("buildlogic.core-and-platform")
 }
 
diff --git a/build-logic/src/main/kotlin/buildlogic/CommonJavaExtension.kt b/build-logic/src/main/kotlin/buildlogic/CommonJavaExtension.kt
diff --git a/build-logic/src/main/kotlin/buildlogic/GitBuildService.kt b/build-logic/src/main/kotlin/buildlogic/GitBuildService.kt
@@ -0,0 +1,25 @@
+package buildlogic
+
+import org.gradle.api.provider.Provider
+import org.gradle.api.provider.ProviderFactory
+import org.gradle.api.services.BuildService
+import org.gradle.api.services.BuildServiceParameters
+import javax.inject.Inject
+
+/**
+ * Git-related extension.
+ */
+internal abstract class GitBuildService @Inject constructor(
+    private val providers: ProviderFactory,
+) : BuildService<BuildServiceParameters.None> {
+    private val gitCommitHash by lazy {
+        val probedCommitHash = providers.exec {
+            commandLine("git", "rev-parse", "--short", "HEAD")
+        }.standardOutput.asText.map { it.trim() }
+
+        providers.gradleProperty("gitCommitHash").orElse(probedCommitHash)
+    }
+
+    fun computeInternalVersion(version: String): Provider<String> =
+        gitCommitHash.map { hash -> "$version+$hash" }
+}
diff --git a/build-logic/src/main/kotlin/buildlogic/GradleExtras.kt b/build-logic/src/main/kotlin/buildlogic/GradleExtras.kt
@@ -8,13 +8,18 @@ import org.gradle.api.artifacts.VersionConstraint
 import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.registerIfAbsent
 
 val Project.ext: ExtraPropertiesExtension
     get() = extensions.getByType()
 
 val Project.stringyLibs: VersionCatalog
     get() = extensions.getByType<VersionCatalogsExtension>().named("libs")
 
+val Project.internalVersion: Provider<String>
+    get() = gradle.sharedServices.registerIfAbsent("git", GitBuildService::class) {}
+        .flatMap { service -> service.computeInternalVersion(project.version as String) }
+
 fun VersionCatalog.getLibrary(name: String): Provider<MinimalExternalModuleDependency> = findLibrary(name).orElseThrow {
     error("Library $name not found in version catalog")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,18 +1,5 @@
-import org.ajoberstar.grgit.Grgit
-
 plugins {
     alias(libs.plugins.codecov)
     id("buildlogic.common")
     id("buildlogic.artifactory-root")
 }
-
-if (!project.hasProperty("gitCommitHash")) {
-    apply(plugin = "org.ajoberstar.grgit")
-    ext["gitCommitHash"] = try {
-        extensions.getByName<Grgit>("grgit").head()?.abbreviatedId
-    } catch (e: Exception) {
-        logger.warn("Error getting commit hash", e)
-
-        "no.git.id"
-    }
-}
diff --git a/craftbook-bukkit/build.gradle.kts b/craftbook-bukkit/build.gradle.kts
@@ -1,14 +1,15 @@
+import buildlogic.internalVersion
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
-    id("java-library")
+    `java-library`
     id("buildlogic.platform")
 }
 
 repositories {
     maven {
         name = "paper"
-        url = uri("https://papermc.io/repo/repository/maven-public/")
+        url = uri("https://repo.papermc.io/repository/maven-public/")
     }
     maven {
         name = "bstats"
@@ -24,13 +25,15 @@ repositories {
     }
 }
 
-val localImplementation = configurations.create("localImplementation") {
+val localImplementation = configurations.dependencyScope("localImplementation") {
     description = "Dependencies used locally, but provided by the runtime Bukkit implementation"
-    isCanBeConsumed = false
-    isCanBeResolved = false
 }
-configurations["compileOnly"].extendsFrom(localImplementation)
-configurations["testImplementation"].extendsFrom(localImplementation)
+configurations.named("compileOnly") {
+    extendsFrom(localImplementation.get())
+}
+configurations.named("testImplementation") {
+    extendsFrom(localImplementation.get())
+}
 
 dependencies {
     "api"(project(":craftbook-core"))
@@ -54,7 +57,7 @@ dependencies {
 }
 
 tasks.named<Copy>("processResources") {
-    val internalVersion = project.ext["internalVersion"]
+    val internalVersion = project.internalVersion
     inputs.property("internalVersion", internalVersion)
     filesMatching("plugin.yml") {
         expand("internalVersion" to internalVersion)
diff --git a/craftbook-bukkit/doctools/build.gradle.kts b/craftbook-bukkit/doctools/build.gradle.kts
@@ -11,7 +11,7 @@ tasks.named<JavaExec>("run") {
 repositories {
     maven {
         name = "paper"
-        url = uri("https://papermc.io/repo/repository/maven-public/")
+        url = uri("https://repo.papermc.io/repository/maven-public/")
     }
     maven {
         name = "EngineHub"
diff --git a/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/betterai/AttackPassiveGoal.java b/craftbook-bukkit/src/main/java/org/enginehub/craftbook/bukkit/mechanics/betterai/AttackPassiveGoal.java
@@ -37,15 +37,15 @@ class AttackPassiveGoal implements Goal<Monster> {
     /**
      * Distance within which the target is considered active and will not be forgotten or overridden.
      */
-    private final static int ACTIVE_DISTANCE = 15;
+    private static final int ACTIVE_DISTANCE = 15;
     /**
      * Distance within which to search for passive mobs to attack.
      */
-    private final static double SEARCH_DISTANCE = 10d;
+    private static final double SEARCH_DISTANCE = 10d;
     /**
      * Distance beyond which the target will always be forgotten.
      */
-    private final static int FORGET_DISTANCE = 60;
+    private static final int FORGET_DISTANCE = 60;
 
     private final Monster monster;
     private final boolean attackPassiveIgnoreHostileMounts;
diff --git a/craftbook-bukkit/src/main/resources/paper-plugin.yml b/craftbook-bukkit/src/main/resources/paper-plugin.yml
@@ -2,7 +2,7 @@ name: CraftBook5
 version: "${internalVersion}"
 main: org.enginehub.craftbook.bukkit.CraftBookPlugin
 author: EngineHub
-api-version: "1.21.4"
+api-version: "1.21.10"
 dependencies:
   server:
     WorldEdit:
diff --git a/craftbook-core/build.gradle.kts b/craftbook-core/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.cadixdev.gradle.licenser.LicenseExtension
-
 plugins {
     id("java-library")
     id("buildlogic.core-and-platform")
@@ -59,12 +57,6 @@ tasks.compileJava {
     options.compilerArgs.add("-Aarg.name.key.prefix=")
 }
 
-configure<LicenseExtension> {
-    exclude {
-        it.file.startsWith(project.layout.buildDirectory.get().asFile)
-    }
-}
-
 tasks.named<Copy>("processResources") {
     from(configurations.named("languageFiles")) {
         rename {
diff --git a/gradle.properties b/gradle.properties
@@ -2,3 +2,5 @@ group=org.enginehub.craftbook
 version=5.0.0-SNAPSHOT
 
 org.gradle.parallel=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,9 +14,9 @@ lang-version = "1604"
 
 [libraries]
 
-licenser = "gradle.plugin.org.cadixdev.gradle:licenser:0.6.1"
+levelHeadered = "net.octyl.level-headered:plugin:0.1.1"
 grgit = "org.ajoberstar.grgit:grgit-gradle:5.2.2"
-shadow = "com.github.johnrengelman:shadow:8.1.1"
+shadow = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.9"
 jfrog-buildinfo = "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
 
 paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.7.1"
@@ -28,10 +28,11 @@ autoService = "com.google.auto.service:auto-service:1.1.1"
 jspecify = "org.jspecify:jspecify:0.3.0"
 jetbrains-annotations = "org.jetbrains:annotations:24.1.0"
 
-junit-bom = "org.junit:junit-bom:5.10.2"
+junit-bom = "org.junit:junit-bom:6.0.1"
 junit-jupiter-api.module = "org.junit.jupiter:junit-jupiter-api"
 junit-jupiter-params.module = "org.junit.jupiter:junit-jupiter-params"
 junit-jupiter-engine.module = "org.junit.jupiter:junit-jupiter-engine"
+junit-platform-launcher.module = "org.junit.platform:junit-platform-launcher"
 
 mockito-bom = "org.mockito:mockito-bom:5.11.0"
 mockito-core.module = "org.mockito:mockito-core"
@@ -54,12 +55,12 @@ adventureGson = "net.kyori:adventure-text-serializer-gson:4.20.0"
 adventurePlain = "net.kyori:adventure-text-serializer-plain:4.20.0"
 
 # Mojang-provided libraries, CHECK AGAINST MINECRAFT for versions
-guava = "com.google.guava:guava:33.3.1-jre!!"
+guava = "com.google.guava:guava:33.5.0-jre!!"
 log4j-bom = "org.apache.logging.log4j:log4j-bom:2.24.1!!"
 log4j-api.module = "org.apache.logging.log4j:log4j-api"
 log4j-core.module = "org.apache.logging.log4j:log4j-core"
-gson = "com.google.code.gson:gson:2.11.0!!"
-fastutil = "it.unimi.dsi:fastutil:8.5.15!!"
+gson = "com.google.code.gson:gson:2.13.2!!"
+fastutil = "it.unimi.dsi:fastutil:8.5.18!!"
 
 # Bukkit-provided libraries, CHECK AGAINST SPIGOT for versions
 # Note that we need to balance support for older MC versus working at all on newer ones, so the exact versions here
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import buildlogic.stringyLibs`
`3`	`3`	`import org.gradle.plugins.ide.idea.model.IdeaModel`
`4`	`4`
`5`	`5`	`plugins {`
`6`		`- id("org.cadixdev.licenser")`
	`6`	`+ id("net.octyl.level-headered")`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`group = rootProject.group`
`@@ -53,10 +53,14 @@ dependencies {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`-license {`
`57`		`- header(rootProject.file("HEADER.txt"))`
`58`		`- include("*/.java")`
`59`		`- include("*/.kt")`
	`56`	`+levelHeadered {`
	`57`	`+ headerTemplate(rootProject.file("HEADER.txt"))`
	`58`	`+`
	`59`	`+ sourceMatchPatterns {`
	`60`	`+ // Exclude overrides for shaded libs`
	`61`	`+ exclude("org/enginehub/craftbook/util/jinglenote/")`
	`62`	`+ exclude("org/enginehub/craftbook/util/profile/")`
	`63`	`+ }`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`plugins.withId("idea") {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ plugins {`
`5`	`5`	`id("buildlogic.artifactory-sub")`
`6`	`6`	`}`
`7`	`7`
`8`		`-ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"`
`9`		`-`
`10`	`8`	`publishing {`
`11`	`9`	`publications {`
`12`	`10`	`register<MavenPublication>("maven") {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id("com.github.johnrengelman.shadow")`
	`2`	`+ id("com.gradleup.shadow")`
`3`	`3`	`id("buildlogic.core-and-platform")`
`4`	`4`	`}`
`5`	`5`