Merge branch 'refs/heads/develop' into version/1.20.1

# Conflicts: # build.gradle.kts # neoforge/build.gradle.kts
Erdragh · May 28, 2024 · 381b3d8 · 381b3d8
2 parents 43c4392 + 241eaa5
commit 381b3d8
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 89 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,28 +18,28 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: checkout repository
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: setup jdk 21
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: 'temurin'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
+        if: ${{ !github.event.inputs.publish }}
+        run: ./gradlew build
 
       - name: Publish with Gradle
         if: ${{ github.event.inputs.publish }}
-        uses: gradle/gradle-build-action@v2
         env:
           MODRINTH_TOKEN: ${{secrets.MODRINTH_TOKEN}}
           CURSEFORGE_TOKEN: ${{secrets.CURSE_TOKEN}}
 
           MODRINTH_ID: ${{vars.MODRINTH_ID}}
           CURSEFORGE_ID: ${{vars.CURSE_ID}}
-        with:
-          arguments: publishMods
+        run: ./gradlew build publishMods
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -1,4 +1,4 @@
-name: build
+name: dependencies
 on:
   push:
     branches: [ "main", "develop" ]
@@ -10,17 +10,14 @@ jobs:
   dependencies:
     runs-on: ubuntu-latest
     steps:
-      - name: checkout repository
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: setup jdk 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
-      - name: Build with Gradle and generate dependency Graph
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: dependencies
-          dependency-graph: 'generate-and-submit'
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v3
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
     id("io.github.goooler.shadow") version "8.1.7" apply false
     // Since this mod/bot is written in Kotlin and expected to run on Minecraft and as such
     // the JVM, the Kotlin plugin is needed
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "2.0.0"
     // For generating documentation based on comments in the code
     id("org.jetbrains.dokka") version "1.9.10"
     java
@@ -267,8 +267,6 @@ subprojects {
                 archiveClassifier.set(null as String?)
             }
         }
-    } else {
-        sourceSets.main.get().resources.srcDir("src/main/generated/resources")
     }
 
     // Disables Gradle's custom module metadata from being published to maven. The
@@ -285,44 +283,46 @@ subprojects {
     }
 
     // Publishing settings
-    publishMods {
-        // These titles get used based on subproject name
-        val titles by extra {
-            mapOf(
-                "fabric" to "Fabric",
-                "neoforge" to "NeoForge",
-                "forge" to "Forge",
-                "quilt" to "Quilt"
-            )
-        }
-        val curseforgePublish by extra {
-            curseforgeOptions {
-                accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
-                minecraftVersions.add(minecraftVersion)
-                projectId = providers.environmentVariable("CURSEFORGE_ID")
-                embeds("sqlite-jdbc")
+    if (!isCommon) {
+        publishMods {
+            // These titles get used based on subproject name
+            val titles by extra {
+                mapOf(
+                    "fabric" to "Fabric",
+                    "neoforge" to "NeoForge",
+                    "forge" to "Forge",
+                    "quilt" to "Quilt"
+                )
             }
-        }
-        val modrinthPublish by extra {
-            modrinthOptions {
-                accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-                minecraftVersions.add(minecraftVersion)
-                projectId = providers.environmentVariable("MODRINTH_ID")
-                embeds("sqlite-jdbc")
+            val curseforgePublish by extra {
+                curseforgeOptions {
+                    accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
+                    minecraftVersions.add(minecraftVersion)
+                    projectId = providers.environmentVariable("CURSEFORGE_ID")
+                    embeds("sqlite-jdbc")
+                }
+            }
+            val modrinthPublish by extra {
+                modrinthOptions {
+                    accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+                    minecraftVersions.add(minecraftVersion)
+                    projectId = providers.environmentVariable("MODRINTH_ID")
+                    embeds("sqlite-jdbc")
+                }
+            }
+            val changelog by extra {
+                // Only gets the lines for the latest version from the Changelog
+                // file. This allows me to keep all previous changes in the file
+                // without having to worry about them being included on new file
+                // uploads.
+                File("CHANGELOG.md")
+                    .readText(StandardCharsets.UTF_8)
+                    .replace(Regex("[^^](#(#|\\n|.)+)|(^#.+)"), "")
+                    .trim()
+            }
+            val type by extra {
+                STABLE
             }
-        }
-        val changelog by extra {
-            // Only gets the lines for the latest version from the Changelog
-            // file. This allows me to keep all previous changes in the file
-            // without having to worry about them being included on new file
-            // uploads.
-            File("CHANGELOG.md")
-                .readText(StandardCharsets.UTF_8)
-                .replace(Regex("[^^](#(#|\\n|.)+)|(^#.+)"), "")
-                .trim()
-        }
-        val type by extra {
-            STABLE
         }
     }
 }

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -51,6 +51,7 @@ publishMods {
         from(curseforgePublish)
         modLoaders.add(project.name)
         file.set(tasks.remapJar.get().archiveFile)
+        additionalFiles.plus(tasks.sourcesJar.get().archiveFile)
         displayName = "$title $version ${titles[project.name]} $minecraftVersion"
         this.version = "$version-mc$minecraftVersion-${project.name}"
         requires("fabric-language-kotlin", "forge-config-api-port-fabric", "fabric-api")
@@ -60,6 +61,7 @@ publishMods {
         from(modrinthPublish)
         modLoaders.add(project.name)
         file.set(tasks.remapJar.get().archiveFile)
+        additionalFiles.plus(tasks.sourcesJar.get().archiveFile)
         displayName = "$title $version ${titles[project.name]} $minecraftVersion"
         this.version = "$version-mc$minecraftVersion-${project.name}"
         requires("fabric-language-kotlin", "forge-config-api-port-fabric", "fabric-api")

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -1,7 +1,6 @@
 import me.modmuss50.mpp.ReleaseType
 import me.modmuss50.mpp.platforms.curseforge.CurseforgeOptions
 import me.modmuss50.mpp.platforms.modrinth.ModrinthOptions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 architectury {
     forge()

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx3G
+org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096
 
 license=MIT
 title=AstralBot

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
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
diff --git a/gradlew b/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,13 +80,11 @@ 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##*/}
-
-# 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=SC2039,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

diff --git a/gradlew.bat b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal