release: Version 2.0.10

.github/workflows/build.yml

@@ -0,0 +1,14 @@
+name: "build"
+
+on:
+  push:
+    branches: [ "**" ]
+    tags-ignore: [ "**" ]
+  pull_request:
+
+jobs:
+  call-build:
+    uses: "jpenilla/actions/.github/workflows/shared-ci.yml@master"
+    with:
+      artifacts-path: 'build/libs/*.jar'
+      loom: true

.github/workflows/minimotd.yml

@@ -1,22 +0,0 @@
-name: Build MiniMOTD
-on: [ push, pull_request ]
-jobs:
-  build:
-    # Only run on PRs if the source branch is on someone else's repo
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: gradle/wrapper-validation-action@v1
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Build with Gradle
-      run: ./gradlew build
-    - run: mkdir staging && cp build/libs/*.jar staging
-    - uses: actions/upload-artifact@v3
-      with:
-        name: Package
-        path: staging

dist/bukkit-bungeecord/build.gradle.kts

@@ -9,13 +9,9 @@ tasks.jar {
 val platforms = setOf(
   projects.minimotdBukkit,
   projects.minimotdBungeecord,
-  projects.minimotdVelocity,
-  projects.minimotdFabric,
-  projects.minimotdSponge7,
-  projects.minimotdSponge8
 ).map { it.dependencyProject }
 
-val universal = tasks.register<Jar>("universal") {
+val dist = tasks.register<Jar>("bukkitAndBungeeJar") {
   artifacts.add("archives", this)
   archiveClassifier.set(null as String?)
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -27,5 +23,5 @@ val universal = tasks.register<Jar>("universal") {
 }
 
 miniMOTDPlatform {
-  jarTask.set(universal)
+  jarTask.set(dist)
 }

gradle.properties

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

gradle/libs.versions.yml

@@ -8,17 +8,19 @@ plugins:
   org.spongepowered.gradle.plugin: 2.0.2
   net.minecrell.plugin-yml.bungee: &plugin-yml 0.5.2
   net.minecrell.plugin-yml.bukkit: *plugin-yml
-  xyz.jpenilla.run-paper: 1.0.6
+  xyz.jpenilla.run-paper: &run-task 2.0.1
+  xyz.jpenilla.run-velocity: *run-task
+  xyz.jpenilla.run-waterfall: *run-task
 
 versions:
   indra: 2.1.1
   shadow: 7.1.2
   testLoggerPlugin: 3.2.0
-  adventure: 4.11.0
-  adventurePlatform: 4.1.2
-  adventurePlatformFabric: 5.4.0-SNAPSHOT
+  adventure: 4.12.0
+  adventurePlatform: 4.2.0
+  adventurePlatformFabric: 5.6.0
   configurate: 4.1.2
-  checkerQual: 3.24.0
+  checkerQual: 3.28.0
   slf4j: 1.7.32
   gson: 2.8.0
   guava: 21.0
@@ -26,12 +28,12 @@ versions:
   paperApi: 1.16.5-R0.1-SNAPSHOT
   paperlib: 1.0.8-SNAPSHOT
   waterfallApi: 1.16-R0.4-SNAPSHOT
-  fabricApi: 0.60.0+1.19.2
-  fabricLoader: 0.14.9
-  fabricMinecraft: 1.19.2
+  fabricApi: 0.68.1+1.19.3
+  fabricLoader: 0.14.11
+  fabricMinecraft: 1.19.3
   spongeApi7: 7.2.0
   velocityApi: 3.1.2-SNAPSHOT
-  jupiterEngine: 5.8.2
+  jupiterEngine: 5.9.0
 
 dependencies:
   adventureBom:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

platform/bukkit/build.gradle.kts

@@ -15,9 +15,10 @@ dependencies {
 
 tasks {
   runServer {
-    minecraftVersion("1.19.2")
+    minecraftVersion("1.19.3")
   }
   shadowJar {
+    platformRelocation("bukkit", "xyz.jpenilla.minimotd.common")
     commonRelocation("org.slf4j")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")

platform/bungeecord/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
   id("minimotd.shadow-platform")
   id("net.minecrell.plugin-yml.bungee")
+  id("xyz.jpenilla.run-waterfall")
 }
 
 dependencies {
@@ -12,10 +13,14 @@ dependencies {
 
 tasks {
   shadowJar {
+    platformRelocation("bungee", "xyz.jpenilla.minimotd.common")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")
     commonRelocation("org.bstats")
   }
+  runWaterfall {
+    waterfallVersion("1.19")
+  }
 }
 
 bungee {

platform/fabric/build.gradle.kts

@@ -37,7 +37,6 @@ tasks {
     configurations = listOf(shade)
     commonConfiguration()
     commonRelocation("io.leangen.geantyref")
-    platformRelocation("fabric", "xyz.jpenilla.minimotd.common")
   }
   remapJar {
     archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")

platform/sponge8/build.gradle.kts

@@ -41,7 +41,6 @@ sponge {
 tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
-    platformRelocation("sponge8", "xyz.jpenilla.minimotd.common")
     dependencies {
       exclude(dependency("io.leangen.geantyref:geantyref"))
     }

platform/velocity/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
   id("minimotd.shadow-platform")
   id("net.kyori.blossom")
+  id("xyz.jpenilla.run-velocity")
 }
 
 dependencies {
@@ -14,9 +15,11 @@ tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
     commonRelocation("io.leangen.geantyref")
-    platformRelocation("velocity", "xyz.jpenilla.minimotd.common")
     commonRelocation("org.bstats")
   }
+  runVelocity {
+    velocityVersion(libs.versions.velocityApi.get())
+  }
 }
 
 blossom {

settings.gradle.kts

@@ -27,21 +27,28 @@ pluginManagement {
 
 plugins {
   id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
-  id("quiet-fabric-loom") version "0.12-SNAPSHOT"
+  id("quiet-fabric-loom") version "1.0-SNAPSHOT"
 }
 
 rootProject.name = "MiniMOTD"
 
+fun setup(name: String, dir: String) {
+  include(name)
+  project(":$name").projectDir = file(dir)
+}
+
+fun platform(name: String) = setup("minimotd-$name", "platform/$name")
+fun dist(name: String) = setup("minimotd-$name", "dist/$name")
+
+setup("minimotd-common", "common")
+
 sequenceOf(
-  "common",
   "bukkit",
   "sponge8",
   "sponge7",
   "bungeecord",
   "velocity",
   "fabric",
-  "universal"
-).forEach {
-  include("minimotd-$it")
-  project(":minimotd-$it").projectDir = file(it)
-}
+).forEach(::platform)
+
+dist("bukkit-bungeecord")