From 4de74932d4479d99746da4b8ed0fcfe803cca5f2 Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Fri, 13 Dec 2024 16:32:06 +0100 Subject: [PATCH] Switch to Java 21 --- .github/workflows/gradle-publish.yml | 4 ++-- .github/workflows/gradle.yml | 8 ++++---- build.gradle.kts | 9 +++------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index b04dedb..d58a9d6 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -44,10 +44,10 @@ jobs: - name: REUSE Compliance Check uses: fsfe/reuse-action@v5 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Generate versions diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9851bdb..3bc248f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -34,10 +34,10 @@ jobs: contents: read steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 @@ -50,10 +50,10 @@ jobs: contents: write steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies. # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md diff --git a/build.gradle.kts b/build.gradle.kts index 1a89f6b..51bca28 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,16 +46,16 @@ subprojects { kotlinOptions { freeCompilerArgs += "-Xjsr305=strict" freeCompilerArgs += "-Xcontext-receivers" - jvmTarget = "17" + jvmTarget = "21" } } kotlin { - jvmToolchain(17) + jvmToolchain(21) } java { - sourceCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 withSourcesJar() withJavadocJar() } @@ -144,9 +144,6 @@ tasks.named("jar") { tasks.test { useJUnitPlatform() } -kotlin { - jvmToolchain(17) -} repositories { mavenLocal()