Gradle 8.2.1, Move Common build.gradle to Kotlin DSL, Made lots of gradle improvements and fixes

build.gradle.kts

@@ -19,6 +19,12 @@ subprojects {
     loom.silentMojangMappingsLicense()
 
     repositories {
+        mavenCentral()
+        maven("https://maven.shedaniel.me/")
+        maven("https://jitpack.io")
+        maven("https://maven.bai.lol")
+        maven("https://cursemaven.com").content { includeGroup("curse.maven") }
+        maven("https://maven.enginehub.org/repo/")
         maven("https://maven.parchmentmc.org")
     }
 

common/build.gradle

@@ -1,68 +0,0 @@
-architectury {
-    common(rootProject.enabled_platforms.split(","))
-}
-
-loom {
-    accessWidenerPath = file("src/main/resources/dimdoors.accesswidener")
-}
-
-repositories {
-    maven {
-        url = "https://maven.shedaniel.me/"
-    }
-    mavenCentral()
-    maven {
-        url = "https://jitpack.io"
-    }
-    maven { url "https://maven.bai.lol" }
-    maven {
-        url "https://cursemaven.com"
-    }
-    maven { url "https://maven.enginehub.org/repo/" }
-}
-
-dependencies {
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
-    modApi "me.shedaniel.cloth:cloth-config:9.0.94"
-    modCompileOnlyApi "mcp.mobius.waila:wthit-api:fabric-${wthitVersion}"
-
-    modApi "com.flowpowered:flow-math:1.0.3"
-    modApi "org.jgrapht:jgrapht-core:1.1.0"
-    modApi "com.github.DimensionalDevelopment:poly2tri.java:0.1.1"
-
-    modApi "com.sk89q.worldedit:worldedit-core:${rootProject.worldedit}"
-}
-
-sourceSets {
-    main {
-        java {
-            srcDir "src/main/schematics"
-            srcDir "src/main/config"
-        }
-        resources {
-            srcDirs "common/src/main/resources"
-        }
-    }
-}
-
-processResources {
-    exclude("*")
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = rootProject.archives_base_name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

common/build.gradle.kts

@@ -0,0 +1,34 @@
+architectury {
+    common("forge", "fabric")
+    platformSetupLoomIde()
+}
+
+loom.accessWidenerPath.set(file("src/main/resources/dimdoors.accesswidener"))
+
+dependencies {
+    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
+    // Do NOT use other classes from fabric loader
+    modImplementation("net.fabricmc:fabric-loader:${project.properties["fabric_loader_version"]}")
+    // Remove the next line if you don't want to depend on the API
+    modApi("dev.architectury:architectury:${project.properties["architectury_version"]}")
+    modApi("me.shedaniel.cloth:cloth-config:9.0.94")
+    modCompileOnlyApi("mcp.mobius.waila:wthit-api:fabric-${project.properties["wthitVersion"]}")
+
+    modApi("com.flowpowered:flow-math:1.0.3")
+    modApi("org.jgrapht:jgrapht-core:1.1.0")
+    modApi("com.github.DimensionalDevelopment:poly2tri.java:0.1.1")
+
+    modApi("com.sk89q.worldedit:worldedit-core:${project.properties["worldedit"]}")
+}
+
+sourceSets.main {
+    java {
+        srcDir("src/main/schematics")
+        srcDir("src/main/config")
+    }
+    resources.srcDirs("common/src/main/resources")
+}
+
+tasks.processResources {
+    exclude("*")
+}

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
 architectury {
@@ -38,22 +38,6 @@ def includeCompile(entry) {
     }
 }
 
-
-repositories {
-    maven {
-        url "https://cursemaven.com"
-    }
-    maven { url "https://maven.bai.lol" }
-    maven { url "https://maven.enginehub.org/repo/" }
-    mavenCentral()
-    maven {
-        url = "https://jitpack.io"
-    }
-    maven {
-        url = "https://maven.shedaniel.me/"
-    }
-}
-
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
@@ -97,18 +81,18 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
     injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier "fabric"
+    archiveClassifier = "fabric"
 }
 
 jar {
-    classifier "dev"
+    archiveClassifier = "dev"
 }
 
 sourcesJar {
@@ -136,17 +120,3 @@ sourceSets {
         }
     }
 }
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

forge/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
 architectury {
@@ -27,21 +27,6 @@ configurations {
     developmentForge.extendsFrom common
 }
 
-repositories {
-    maven { url "https://maven.bai.lol" }
-    maven {
-        url "https://cursemaven.com"
-    }
-    maven { url "https://maven.enginehub.org/repo/" }
-    maven {
-        url = "https://maven.shedaniel.me/"
-    }
-    mavenCentral()
-    maven {
-        url = "https://jitpack.io"
-    }
-}
-
 dependencies {
     forge "net.minecraftforge:forge:${rootProject.forge_version}"
     // Remove the next line if you don't want to depend on the API
@@ -78,17 +63,17 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier "forge"
+    archiveClassifier = "forge"
 }
 
 jar {
-    classifier "dev"
+    archiveClassifier = "dev"
 }
 
 sourcesJar {
@@ -112,18 +97,3 @@ sourceSets {
         }
     }
 }
-
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

gradle.properties

@@ -7,10 +7,10 @@ archives_base_name=dimdoors
 mod_version=5.2.0
 maven_group=org.dimdev
 
-architectury_version=8.1.79
+architectury_version=8.2.89
 
-fabric_loader_version=0.14.19
-fabric_api_version=0.78.0+1.19.4
+fabric_loader_version=0.14.21
+fabric_api_version=0.86.1+1.19.4
 
 forge_version=1.19.4-45.1.0
 
@@ -18,7 +18,7 @@ parchment=2023.06.26
 
 cardinal_components_version=5.1.0
 
-wthitVersion=7.2.4
+wthitVersion=7.4.0
 
 worldedit=7.3.0-SNAPSHOT
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 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,13 +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##*/}
-
-# 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +130,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=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
@@ -193,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +213,12 @@ set -- \
         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.

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,7 +41,7 @@ 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.
@@ -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