From 552c07989c4e50c87e9be77a3b3ac11f6901f782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Sat, 21 Oct 2023 17:10:35 +0200 Subject: [PATCH] Compile with Java 21 --- .github/workflows/default.yml | 8 ++++---- .github/workflows/dependency_diff.yml | 2 +- .github/workflows/publish_release.yml | 2 +- easylauncher/build.gradle | 2 +- gradle/plugins/build.gradle | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 052cb739..f3e0296d 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 20 + java-version: 21 - name: Write Gradle build properties to `~/.gradle/gradle.properties` run: | @@ -86,7 +86,7 @@ jobs: strategy: fail-fast: false matrix: - javaVersion: [ 17, 20 ] + javaVersion: [ 17, 21 ] gradle: [ release-candidate ] agp: ${{ fromJSON(needs.provide-agp-version-matrix.outputs.agp-versions) }} include: @@ -134,7 +134,7 @@ jobs: strategy: fail-fast: false matrix: - javaVersion: [ 17, 20 ] + javaVersion: [ 17, 21 ] os: [ ubuntu-latest, windows-latest, macos-latest ] steps: @@ -174,7 +174,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 20 + java-version: 21 - name: Write Gradle build properties to `~/.gradle/gradle.properties` run: | diff --git a/.github/workflows/dependency_diff.yml b/.github/workflows/dependency_diff.yml index 8df4176a..e1345834 100644 --- a/.github/workflows/dependency_diff.yml +++ b/.github/workflows/dependency_diff.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 20 + java-version: 21 - name: Write Gradle build properties to `~/.gradle/gradle.properties` run: | diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 90cba0b5..4b231ddc 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 20 + java-version: 21 - name: Write Gradle build properties to `~/.gradle/gradle.properties` run: | diff --git a/easylauncher/build.gradle b/easylauncher/build.gradle index 10c63723..53ecba07 100644 --- a/easylauncher/build.gradle +++ b/easylauncher/build.gradle @@ -49,7 +49,7 @@ tasks.withType(KotlinCompile).configureEach { } } kotlin { - jvmToolchain(20) + jvmToolchain(21) } dependencies { diff --git a/gradle/plugins/build.gradle b/gradle/plugins/build.gradle index 697eb3dc..6a386c8c 100644 --- a/gradle/plugins/build.gradle +++ b/gradle/plugins/build.gradle @@ -22,7 +22,7 @@ dependencies { } kotlin { - jvmToolchain(20) + jvmToolchain(21) } gradlePlugin {