From 0ec46fe38ea47bba0a8b89728b4cec06a10896ef Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Fri, 31 Oct 2025 22:27:38 +0000 Subject: [PATCH] Update CI to use Java 21 --- .github/workflows/main-ci.yml | 4 ++-- .github/workflows/make-doc.yml | 2 +- CONTRIBUTING.md | 4 ++-- .../src/main/kotlin/cc-tweaked.java-convention.gradle.kts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml index 6d3675c45..8a10d43ea 100644 --- a/.github/workflows/main-ci.yml +++ b/.github/workflows/main-ci.yml @@ -14,7 +14,7 @@ jobs: - name: 📥 Set up Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: 📥 Setup Gradle @@ -87,7 +87,7 @@ jobs: - name: 📥 Set up Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: 📥 Setup Gradle diff --git a/.github/workflows/make-doc.yml b/.github/workflows/make-doc.yml index 424cbceb7..c49919827 100644 --- a/.github/workflows/make-doc.yml +++ b/.github/workflows/make-doc.yml @@ -17,7 +17,7 @@ jobs: - name: 📥 Set up Java uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: 'temurin' - name: 📥 Setup Gradle diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b12a1b01..45e1a0f7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 17 (JDK). This can be downloaded from [Adoptium]. + - Java Development Kit 21 (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=17 "Download OpenJDK 17" +[Adoptium]: https://adoptium.net/temurin/releases?version=21 "Download OpenJDK 21" [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." diff --git a/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts b/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts index 8265c8865..213aeabf2 100644 --- a/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts @@ -161,7 +161,7 @@ tasks.javadoc { options { val stdOptions = this as StandardJavadocDocletOptions stdOptions.addBooleanOption("Xdoclint:all,-missing", true) - stdOptions.links("https://docs.oracle.com/en/java/javase/17/docs/api/") + stdOptions.links("https://docs.oracle.com/en/java/javase/21/docs/api/") } }