From 2c28293ccc36ed942126a533bed819ee021180e8 Mon Sep 17 00:00:00 2001 From: Yannick Lamprecht Date: Fri, 4 Oct 2024 17:14:45 +0200 Subject: [PATCH] update action to java 21 --- .github/workflows/publish_to_nexus.yml | 4 ++-- .github/workflows/verify.yml | 5 +++-- build.gradle.kts | 3 +-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish_to_nexus.yml b/.github/workflows/publish_to_nexus.yml index 5cb89b1..762a0b2 100644 --- a/.github/workflows/publish_to_nexus.yml +++ b/.github/workflows/publish_to_nexus.yml @@ -17,11 +17,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 18 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: temurin - java-version: 18 + java-version: 21 - name: Build with Gradle run: ./gradlew --build-cache build - name: Test with Gradle diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 8e614d9..60e0d16 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -8,11 +8,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 18 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: temurin - java-version: 18 + java-version: 21 + architecture: x64 - name: Build with Gradle run: ./gradlew --build-cache build - name: Test with Gradle diff --git a/build.gradle.kts b/build.gradle.kts index 2e9e441..762b193 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -209,8 +209,7 @@ fun applyJavaDocOptions(options: MinimalJavadocOptions) { tasks { register("allJavadocs") { applyJavaDocOptions(options) - - destinationDir = file("${buildDir}/docs/javadoc") + setDestinationDir(file("${layout.buildDirectory}/docs/javadoc")) val projects = project.rootProject.allprojects.filter { p -> publicProjects.contains(p.name) } setSource(projects.map { p -> p.sourceSets.main.get().allJava }) classpath = files(projects.map { p -> p.sourceSets.main.get().compileClasspath })