Update dependencies, Loom and Gradle

ReviversMC · Jun 25, 2024 · b83d1d3 · b83d1d3
1 parent 20c71dc
commit b83d1d3
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 43 deletions.
diff --git a/build.gradle b/build.gradle
@@ -147,28 +147,37 @@ allprojects {
 
 
 dependencies {
-	include api(project(path: ':microdurability-core', configuration: 'namedElements'))
-	include api(project(path: ':microdurability-1.16', configuration: 'namedElements'))
-	include api(project(path: ':microdurability-1.17', configuration: 'namedElements'))
-	include api(project(path: ':microdurability-1.19', configuration: 'namedElements'))
-	include api(project(path: ':microdurability-1.19.4', configuration: 'namedElements'))
-	include api(project(path: ':microdurability-1.20', configuration: 'namedElements'))
-	include api(project(path: ':microdurability-1.20.5', configuration: 'namedElements'))
-	include api(project(path: ':microdurability-1.21', configuration: 'namedElements'))
-
-	modRuntimeOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version_1_20_5}"
-	modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version_1_20_5}"
-	modRuntimeOnly("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version_1_20_5}") {
+	include project(path: ':microdurability-core')
+	include project(path: ':microdurability-1.16')
+	include project(path: ':microdurability-1.17')
+	include project(path: ':microdurability-1.19')
+	include project(path: ':microdurability-1.19.4')
+	include project(path: ':microdurability-1.20')
+	include project(path: ':microdurability-1.20.5')
+	include project(path: ':microdurability-1.21')
+
+	runtimeOnly project(path: ':microdurability-core', configuration: "namedElements")
+	runtimeOnly project(path: ':microdurability-1.16', configuration: "namedElements")
+	runtimeOnly project(path: ':microdurability-1.17', configuration: "namedElements")
+	runtimeOnly project(path: ':microdurability-1.19', configuration: "namedElements")
+	runtimeOnly project(path: ':microdurability-1.19.4', configuration: "namedElements")
+	runtimeOnly project(path: ':microdurability-1.20', configuration: "namedElements")
+	runtimeOnly project(path: ':microdurability-1.20.5', configuration: "namedElements")
+	runtimeOnly project(path: ':microdurability-1.21', configuration: "namedElements")
+
+	modRuntimeOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version_1_21}"
+	modRuntimeOnly "com.terraformersmc:modmenu:${project.modmenu_version_1_21}"
+	modRuntimeOnly("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version_1_21}") {
 		exclude(group: 'net.fabricmc.fabric-api')
 	}
 
-	minecraft "com.mojang:minecraft:${minecraft_version_1_20_5}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings_1_20_5}:v2"
+	minecraft "com.mojang:minecraft:${minecraft_version_1_21}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings_1_21}:v2"
 }
 
 
 processResources {
 	from("${rootDir}/assets/icon.png") {
-		into "assets/microdurability/"
+		into 'assets/microdurability/'
 	}
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,8 +4,8 @@ org.gradle.parallel = true
 org.gradle.workers.max = 3
 
 # Gradle Plugins
-fabric_loom_version = 1.6-SNAPSHOT
-checkstyle_version = 10.16.+
+fabric_loom_version = 1.7-SNAPSHOT
+checkstyle_version = 10.17.+
 spotless_version = 6.25.+
 
 # Mod Properties
@@ -52,7 +52,7 @@ modmenu_version_1_20_5 = 10.0.0
 minecraft_version_1_21 = 1.21
 yarn_mappings_1_21 = 1.21+build.2
 cloth_config_version_1_21 = 15.0.127
-modmenu_version_1_21 = 11.0.0
+modmenu_version_1_21 = 11.0.1
 
 # Dev-Env Mods
 use_third_party_mods = true
@@ -125,5 +125,5 @@ lithium_version_1_21 = mc1.21-0.12.7
 ferritecore_version_1_21 = 7.0.0-fabric
 # threadtweak_version_1_21 =
 fadeless_version_1_21 = 1.0.1
-#raised_version_1_21 =
+# raised_version_1_21 =
 # double_hotbar_version_1_21 =
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,7 +1,7 @@
-distributionBase = GRADLE_USER_HOME
-distributionPath = wrapper/dists
-distributionUrl = https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-networkTimeout = 10000
-validateDistributionUrl = true
-zipStoreBase = GRADLE_USER_HOME
-zipStorePath = wrapper/dists
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -145,15 +145,15 @@ 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
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# 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" \

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 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
 
@@ -57,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