From 16dd9002b3056f59d103fed4771c4be0642325fb Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:08:42 +0200 Subject: [PATCH] Move GH actions to J21 Co-authored-by: Kichura <68134602+kichura@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- build.gradle | 4 ++-- jitpack.yml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2654fc2..2b1650b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,11 +9,11 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 check-latest: true - name: Cache Dependencies uses: actions/cache@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1ec9e02..6f95c4f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,11 +10,11 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper uses: gradle/actions/wrapper-validation@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 17 + java-version: 21 check-latest: true - name: Build and Publish env: diff --git a/build.gradle b/build.gradle index fc1b5b9..591b0f6 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ allprojects { java { toolchain { // lwjgl2 works with Adoptium - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) vendor = JvmVendorSpec.ADOPTIUM } withSourcesJar() @@ -166,7 +166,7 @@ processResources { List mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(",")) .map({ it -> it.trim() }) .collect(Collectors.toList()) -List javaVersions = IntStream.rangeClosed(8, 17) +List javaVersions = IntStream.rangeClosed(8, 21) .mapToObj { n -> (String) "Java $n" } .collect(Collectors.toList()) String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits" diff --git a/jitpack.yml b/jitpack.yml index 84f0916..2b5b19b 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,7 +1,7 @@ -# Deploys the latest stable JDK 17 available and sets it to default without having to manually specify it here, +# Deploys the latest stable JDK 21 available and sets it to default without having to manually specify it here, # Which includes using temurin as the distribution. before_install: - curl -s "https://get.sdkman.io" | bash - source ~/.sdkman/bin/sdkman-init.sh - - sdk install java 17.0.10-tem - - sdk use java 17.0.10-tem + - sdk install java 21.0.2-tem + - sdk use java 21.0.2-tem