1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-02-07 19:30:16 +00:00

Update some build tooling

Mostly now use JDK 25 to build, to allow us to use markdown docstrings
in the future — this makes the javadoc generator *much* simpler.
This commit is contained in:
Jonathan Coates
2026-01-25 09:34:26 +00:00
parent 419441164d
commit c98b99863d
12 changed files with 365 additions and 324 deletions

View File

@@ -14,7 +14,7 @@ jobs:
- name: 📥 Set up Java
uses: actions/setup-java@v4
with:
java-version: 21
java-version: 25
distribution: 'temurin'
- name: 📥 Setup Gradle
@@ -87,7 +87,7 @@ jobs:
- name: 📥 Set up Java
uses: actions/setup-java@v4
with:
java-version: 21
java-version: 25
distribution: 'temurin'
- name: 📥 Setup Gradle

View File

@@ -17,7 +17,7 @@ jobs:
- name: 📥 Set up Java
uses: actions/setup-java@v4
with:
java-version: 21
java-version: 25
distribution: 'temurin'
- name: 📥 Setup Gradle

View File

@@ -28,7 +28,7 @@ Translations are managed through [CrowdIn], an online interface for managing lan
In order to develop CC: Tweaked, you'll need to download the source code and then run it.
- Make sure you've got the following software installed:
- Java Development Kit 21 (JDK). This can be downloaded from [Adoptium].
- Java Development Kit 25 (JDK). This can be downloaded from [Adoptium].
- [Git](https://git-scm.com/).
- [NodeJS 20 or later][node].
@@ -101,7 +101,7 @@ about how you can build on that until you've covered everything!
[new-issue]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose "Create a new issue"
[community]: README.md#community "Get in touch with the community."
[Adoptium]: https://adoptium.net/temurin/releases?version=21 "Download OpenJDK 21"
[Adoptium]: https://adoptium.net/temurin/releases?version=25 "Download OpenJDK 25"
[illuaminate]: https://github.com/SquidDev/illuaminate/ "Illuaminate on GitHub"
[docs]: https://tweaked.cc/ "CC: Tweaked documentation"
[ldoc]: http://stevedonovan.github.io/ldoc/ "ldoc, a Lua documentation generator."

View File

@@ -45,9 +45,9 @@ class CCTweakedPlugin : Plugin<Project> {
companion object {
/**
* The version we run with. We use Java 21 here, as our Gradle build requires that.
* The version we run with. We use Java 25 here, as our Gradle build requires that.
*/
val JDK_VERSION = JavaLanguageVersion.of(21)
val JDK_VERSION = JavaLanguageVersion.of(25)
/**
* The Java version we target. Should be the same as what Minecraft uses.

View File

@@ -1,2 +1,2 @@
#This file is generated by updateDaemonJvm
toolchainVersion=21
toolchainVersion=25

View File

@@ -31,7 +31,7 @@ commonsCli = "1.10.0"
jetbrainsAnnotations = "26.0.2-1"
jspecify = "1.0.0"
jzlib = "1.1.3"
kotlin = "2.2.21"
kotlin = "2.3.0"
kotlin-coroutines = "1.10.2"
nightConfig = "3.8.3"
@@ -61,14 +61,14 @@ cctJavadoc = "1.8.5"
checkstyle = "12.1.1"
errorProne-core = "2.45.0"
errorProne-plugin = "4.3.0"
fabric-loom = "1.14.5"
fabric-loom = "1.15.2"
githubRelease = "2.5.2"
gradleVersions = "0.53.0"
ideaExt = "1.3"
illuaminate = "0.1.0-83-g1131f68"
lwjgl = "3.3.6"
minotaur = "2.8.7"
modDevGradle = "2.0.124"
modDevGradle = "2.0.140"
nullAway = "0.12.11"
shadow = "9.2.2"
spotless = "8.0.0"

Binary file not shown.

View File

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

9
gradlew vendored
View File

@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# 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" )
@@ -205,15 +203,14 @@ fi
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,
# * DEFAULT_JVM_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 \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.

3
gradlew.bat vendored
View File

@@ -70,11 +70,10 @@ goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%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

651
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -24,7 +24,7 @@ import java.util.Optional;
* Alternatively, one may specify the desired arguments as normal parameters and the argument parsing code will
* be generated automatically.
* <p>
* Each parameter must be one of the given types supported by {@link IArguments} (for instance, {@link int} or
* Each parameter must be one of the given types supported by {@link IArguments} (for instance, {@code int} or
* {@link Map}). Optional values are supported by accepting a parameter of type {@link Optional}.
* </li>
* </ul>