update action to java 21 (#125)

eldoriarpg · Oct 4, 2024 · a86ffda · a86ffda
1 parent fd7c15a
commit a86ffda
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -209,8 +209,7 @@ fun applyJavaDocOptions(options: MinimalJavadocOptions) {
 tasks {
     register<Javadoc>("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 })