release: Version 2.2.2

This is now the third-oldest LTS version, supporting anything older is not worth the build headache and outdated dependencies anymore.

common/build.gradle.kts

@@ -9,10 +9,6 @@ tasks.jar {
   }
 }
 
-java {
-  disableAutoTargetJvm()
-}
-
 dependencies {
   api(libs.configurateHocon)
   api(platform(libs.adventureBom))

gradle.properties

@@ -1,5 +1,5 @@
 group=xyz.jpenilla
-version=2.2.0
+version=2.2.2
 description=Use MiniMessage text formatting in the server list MOTD.
 
 org.gradle.caching=true

gradle/build-logic/src/main/kotlin/extensions.kt

@@ -6,7 +6,7 @@ import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.getByType
 
 fun Project.lastCommitHash(): String =
-  extensions.getByType<IndraGitExtension>().commit()?.name?.substring(0, 7) ?: "unknown"
+  extensions.getByType<IndraGitExtension>().commit().orNull?.name?.substring(0, 7) ?: "unknown"
 
 val Project.libs: LibrariesForLibs
   get() = extensions.getByType()
@@ -45,6 +45,9 @@ val bukkitVersions = listOf(
 
 val paperVersions = listOf(
   "1.21.8",
+  "1.21.9",
+  "1.21.10",
+  "1.21.11",
 )
 
 val productionJarAttribute = Attribute.of("minimotd.productionJar", String::class.java)

gradle/build-logic/src/main/kotlin/minimotd.base-conventions.gradle.kts

@@ -11,13 +11,16 @@ version = (version as String)
 
 indra {
   javaVersions {
+    target(17)
     minimumToolchain(21)
-    target(8)
+    testWith(17, 21, 25)
   }
   github(Constants.GITHUB_USER, Constants.GITHUB_REPO)
   mitLicense()
 }
 
+java.disableAutoTargetJvm()
+
 repositories {
   mavenCentral {
     mavenContent { releasesOnly() }
@@ -36,11 +39,8 @@ repositories {
 }
 
 dependencies {
-  testImplementation(libs.jupiterEngine)
-  // TODO: work around archloom issue?
-  if (project.name != "minimotd-neoforge" && project.name != "minimotd-fabric") {
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-  }
+  testImplementation(libs.junitJupiter)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks {

gradle/build-logic/src/main/kotlin/shadow-extensions.kt

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.file.DuplicatesStrategy
 
 fun ShadowJar.commonRelocation(pkg: String) {
   relocate(pkg, "${Constants.RELOCATION_BASE_PACKAGE}.$pkg")
@@ -6,6 +7,11 @@ fun ShadowJar.commonRelocation(pkg: String) {
 
 fun ShadowJar.commonConfiguration() {
   mergeServiceFiles()
+  // Needed for mergeServiceFiles to work properly in Shadow 9+
+  filesMatching("META-INF/services/**") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
+
   commonRelocation("org.spongepowered.configurate")
   commonRelocation("com.typesafe.config")
   dependencies {

gradle/libs.versions.toml

@@ -1,31 +1,30 @@
 [versions]
-run-task = "3.0.0-beta.1"
-resource-factory = "1.3.0"
-mod-publish-plugin = "0.8.4"
-hangarPublishPlugin = "0.1.3"
-indra = "3.2.0"
-shadow = "9.0.2"
-adventure = "4.24.0"
+run-task = "3.0.2"
+resource-factory = "1.3.1"
+mod-publish-plugin = "1.0.0"
+hangarPublishPlugin = "0.1.4"
+indra = "4.0.0"
+shadow = "9.2.2"
+adventure = "4.25.0"
 adventurePlatform = "4.4.1"
-adventurePlatformMod = "6.6.0"
+adventurePlatformMod = "6.8.0"
 configurate = "4.2.0"
-slf4j = "1.7.32"
+slf4j = "1.7.36"
 gson = "2.8.0"
 bstats = "3.1.0"
 paperApiLegacy = "1.16.5-R0.1-SNAPSHOT"
-paperApi = "1.21.8-R0.1-SNAPSHOT"
+paperApi = "1.21.11-R0.1-SNAPSHOT"
 paperlib = "1.0.8"
 waterfallApi = "1.16-R0.5-SNAPSHOT"
-fabricApi = "0.131.0+1.21.8"
-fabricLoader = "0.16.14"
-minecraft = "1.21.8"
+fabricApi = "0.139.5+1.21.11"
+fabricLoader = "0.18.2"
+minecraft = "1.21.11"
 spongeApi7 = "7.2.0"
 velocityApi = "3.4.0-SNAPSHOT"
-jupiterEngine = "5.13.4"
-neoforge = "21.8.29"
+neoforge = "21.11.6-beta"
 
 [plugins]
-blossom = { id = "net.kyori.blossom", version = "2.1.0" }
+blossom = { id = "net.kyori.blossom", version = "2.2.0" }
 sponge-gradle-plugin = { id = "org.spongepowered.gradle.plugin", version = "2.3.0" }
 run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-task" }
 run-velocity = { id = "xyz.jpenilla.run-velocity" }
@@ -45,7 +44,7 @@ adventurePlatformFabric = { group = "net.kyori", name = "adventure-platform-fabr
 adventurePlatformNeoforge = { group = "net.kyori", name = "adventure-platform-neoforge", version.ref = "adventurePlatformMod" }
 adventurePlatformSpongeApi = { group = "net.kyori", name = "adventure-platform-spongeapi", version.ref = "adventurePlatform" }
 minimessage = { group = "net.kyori", name = "adventure-text-minimessage" }
-miniplaceholders = "io.github.miniplaceholders:miniplaceholders-api:3.0.1"
+miniplaceholders = "io.github.miniplaceholders:miniplaceholders-api:3.1.0"
 
 brigadier = "com.mojang:brigadier:1.3.10"
 
@@ -80,7 +79,7 @@ spongeApi7 = { group = "org.spongepowered", name = "spongeapi", version.ref = "s
 
 velocityApi = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocityApi" }
 
-jupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiterEngine" }
+junitJupiter = "org.junit.jupiter:junit-jupiter:6.0.1"
 
 # build-logic
 indraCommon = { group = "net.kyori", name = "indra-common", version.ref = "indra" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/MiniMOTDFabric.java

@@ -108,7 +108,7 @@ public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<Se
       BrigadierUtil.buildTree(
         new CommandHandler(this.miniMOTD),
         sourceStack -> this.audiences().audience(sourceStack),
-        sourceStack -> sourceStack.hasPermission(Commands.LEVEL_ADMINS)
+        Commands.hasPermission(Commands.LEVEL_ADMINS)
       )
     ));
   }

platform/fabric/src/main/resources/fabric.mod.json

@@ -23,9 +23,9 @@
     "minimotd-fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.16.14",
+    "fabricloader": ">=0.18.2",
     "fabric-api": "*",
-    "minecraft": "1.21.8",
+    "minecraft": ">=1.21.11",
     "adventure-platform-fabric": "*"
   }
 }

platform/neoforge/src/main/java/xyz/jpenilla/minimotd/neoforge/MiniMOTDNeoForge.java

@@ -92,7 +92,7 @@ public final class MiniMOTDNeoForge implements MiniMOTDPlatform<ServerStatus.Fav
         BrigadierUtil.buildTree(
           new CommandHandler(this.miniMOTD),
           sourceStack -> this.audiences().audience(sourceStack),
-          sourceStack -> sourceStack.hasPermission(Commands.LEVEL_ADMINS)
+          Commands.hasPermission(Commands.LEVEL_ADMINS)
         )
       );
     });

platform/neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -23,7 +23,7 @@ side = "BOTH"
 [[dependencies.minimotd]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.8,1.22)"
+versionRange = "[1.21.11,)"
 ordering = "NONE"
 side = "BOTH"
 

platform/sponge8/build.gradle.kts

@@ -55,11 +55,16 @@ publishMods.modrinth {
   modLoaders.add("sponge")
   minecraftVersions.addAll(
     "1.16.5",
-    "1.17.1",
     "1.18.2",
     "1.19.4",
     "1.20.6",
+    "1.21.1",
+    "1.21.3",
+    "1.21.4",
+    "1.21.5",
     "1.21.8",
+    "1.21.10",
+    "1.21.11",
   )
   optional("miniplaceholders")
 }

platform/velocity/build.gradle.kts

@@ -10,7 +10,11 @@ dependencies {
   compileOnly(libs.velocityApi)
 }
 
-java.disableAutoTargetJvm()
+indra {
+  javaVersions {
+    target(21)
+  }
+}
 
 tasks {
   shadowJar {

settings.gradle.kts

@@ -7,16 +7,14 @@ pluginManagement {
     maven("https://maven.neoforged.net/releases/") {
       mavenContent { releasesOnly() }
     }
-    maven("https://repo.jpenilla.xyz/snapshots/") {
-      mavenContent { snapshotsOnly() }
-    }
+    maven("https://repo.jpenilla.xyz/snapshots/")
   }
   includeBuild("gradle/build-logic")
 }
 
 plugins {
-  id("net.neoforged.moddev.repositories") version "2.0.107" apply false
-  id("quiet-fabric-loom") version "1.11-SNAPSHOT" apply false
+  id("net.neoforged.moddev.repositories") version "2.0.124" apply false
+  id("quiet-fabric-loom") version "1.13-SNAPSHOT" apply false
   id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }