Skip to content

Commit c98b998

Browse files
committed
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.
1 parent 4194411 commit c98b998

File tree

12 files changed

+365
-324
lines changed

12 files changed

+365
-324
lines changed

.github/workflows/main-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: 📥 Set up Java
1515
uses: actions/setup-java@v4
1616
with:
17-
java-version: 21
17+
java-version: 25
1818
distribution: 'temurin'
1919

2020
- name: 📥 Setup Gradle
@@ -87,7 +87,7 @@ jobs:
8787
- name: 📥 Set up Java
8888
uses: actions/setup-java@v4
8989
with:
90-
java-version: 21
90+
java-version: 25
9191
distribution: 'temurin'
9292

9393
- name: 📥 Setup Gradle

.github/workflows/make-doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: 📥 Set up Java
1818
uses: actions/setup-java@v4
1919
with:
20-
java-version: 21
20+
java-version: 25
2121
distribution: 'temurin'
2222

2323
- name: 📥 Setup Gradle

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Translations are managed through [CrowdIn], an online interface for managing lan
2828
In order to develop CC: Tweaked, you'll need to download the source code and then run it.
2929

3030
- Make sure you've got the following software installed:
31-
- Java Development Kit 21 (JDK). This can be downloaded from [Adoptium].
31+
- Java Development Kit 25 (JDK). This can be downloaded from [Adoptium].
3232
- [Git](https://git-scm.com/).
3333
- [NodeJS 20 or later][node].
3434

@@ -101,7 +101,7 @@ about how you can build on that until you've covered everything!
101101

102102
[new-issue]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose "Create a new issue"
103103
[community]: README.md#community "Get in touch with the community."
104-
[Adoptium]: https://adoptium.net/temurin/releases?version=21 "Download OpenJDK 21"
104+
[Adoptium]: https://adoptium.net/temurin/releases?version=25 "Download OpenJDK 25"
105105
[illuaminate]: https://github.com/SquidDev/illuaminate/ "Illuaminate on GitHub"
106106
[docs]: https://tweaked.cc/ "CC: Tweaked documentation"
107107
[ldoc]: http://stevedonovan.github.io/ldoc/ "ldoc, a Lua documentation generator."

buildSrc/src/main/kotlin/cc/tweaked/gradle/CCTweakedPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class CCTweakedPlugin : Plugin<Project> {
4545

4646
companion object {
4747
/**
48-
* The version we run with. We use Java 21 here, as our Gradle build requires that.
48+
* The version we run with. We use Java 25 here, as our Gradle build requires that.
4949
*/
50-
val JDK_VERSION = JavaLanguageVersion.of(21)
50+
val JDK_VERSION = JavaLanguageVersion.of(25)
5151

5252
/**
5353
* The Java version we target. Should be the same as what Minecraft uses.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#This file is generated by updateDaemonJvm
2-
toolchainVersion=21
2+
toolchainVersion=25

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ commonsCli = "1.10.0"
3131
jetbrainsAnnotations = "26.0.2-1"
3232
jspecify = "1.0.0"
3333
jzlib = "1.1.3"
34-
kotlin = "2.2.21"
34+
kotlin = "2.3.0"
3535
kotlin-coroutines = "1.10.2"
3636
nightConfig = "3.8.3"
3737

@@ -61,14 +61,14 @@ cctJavadoc = "1.8.5"
6161
checkstyle = "12.1.1"
6262
errorProne-core = "2.45.0"
6363
errorProne-plugin = "4.3.0"
64-
fabric-loom = "1.14.5"
64+
fabric-loom = "1.15.2"
6565
githubRelease = "2.5.2"
6666
gradleVersions = "0.53.0"
6767
ideaExt = "1.3"
6868
illuaminate = "0.1.0-83-g1131f68"
6969
lwjgl = "3.3.6"
7070
minotaur = "2.8.7"
71-
modDevGradle = "2.0.124"
71+
modDevGradle = "2.0.140"
7272
nullAway = "0.12.11"
7373
shadow = "9.2.2"
7474
spotless = "8.0.0"

gradle/wrapper/gradle-wrapper.jar

2.53 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)