Move GH actions to J21

Co-authored-by: Kichura <68134602+kichura@users.noreply.github.com>
This commit is contained in:
FlorianMichael 2024-04-21 17:08:42 +02:00
parent 057bdc925f
commit 16dd9002b3
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 9 additions and 9 deletions

View File

@ -9,11 +9,11 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Validate Gradle Wrapper - name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v3 uses: gradle/actions/wrapper-validation@v3
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: 17 java-version: 21
check-latest: true check-latest: true
- name: Cache Dependencies - name: Cache Dependencies
uses: actions/cache@v4 uses: actions/cache@v4

View File

@ -10,11 +10,11 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Validate Gradle Wrapper - name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@v3 uses: gradle/actions/wrapper-validation@v3
- name: Set up JDK 17 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: 17 java-version: 21
check-latest: true check-latest: true
- name: Build and Publish - name: Build and Publish
env: env:

View File

@ -43,7 +43,7 @@ allprojects {
java { java {
toolchain { toolchain {
// lwjgl2 works with Adoptium // lwjgl2 works with Adoptium
languageVersion = JavaLanguageVersion.of(17) languageVersion = JavaLanguageVersion.of(21)
vendor = JvmVendorSpec.ADOPTIUM vendor = JvmVendorSpec.ADOPTIUM
} }
withSourcesJar() withSourcesJar()
@ -166,7 +166,7 @@ processResources {
List<String> mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(",")) List<String> mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(","))
.map({ it -> it.trim() }) .map({ it -> it.trim() })
.collect(Collectors.toList()) .collect(Collectors.toList())
List<String> javaVersions = IntStream.rangeClosed(8, 17) List<String> javaVersions = IntStream.rangeClosed(8, 21)
.mapToObj { n -> (String) "Java $n" } .mapToObj { n -> (String) "Java $n" }
.collect(Collectors.toList()) .collect(Collectors.toList())
String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits" String changelogMsg = "A changelog can be found at https://github.com/ViaVersion/ViaFabric/commits"

View File

@ -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. # Which includes using temurin as the distribution.
before_install: before_install:
- curl -s "https://get.sdkman.io" | bash - curl -s "https://get.sdkman.io" | bash
- source ~/.sdkman/bin/sdkman-init.sh - source ~/.sdkman/bin/sdkman-init.sh
- sdk install java 17.0.10-tem - sdk install java 21.0.2-tem
- sdk use java 17.0.10-tem - sdk use java 21.0.2-tem