Merge pull request #15 from mblink/java-25

Build for Java 25

Author: mrdziuban

.github/workflows/ci.yml

@@ -30,7 +30,11 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.20, 3.7.3]
-        java: [temurin@11, temurin@17, temurin@21]
+        java:
+          - temurin@11
+          - temurin@17
+          - temurin@21
+          - temurin@25
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -62,6 +66,14 @@ jobs:
           java-version: 21
           cache: sbt
 
+      - name: Setup Java (temurin@25)
+        if: matrix.java == 'temurin@25'
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 25
+          cache: sbt
+
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
@@ -77,25 +89,25 @@ jobs:
         run: sbt '++ ${{ matrix.scala }}' Test/compile
 
       - name: Build CLI
-        if: matrix.java == 'temurin@21' && matrix.scala == '3.7.3' && github.event_name == 'push'
+        if: matrix.java == 'temurin@25' && matrix.scala == '3.7.3' && github.event_name == 'push'
         env:
           FIND_UNUSED_CLI_ASSEMBLY_JAR_NAME: ${{ format('find-unused-{0}.jar', startsWith(github.ref, 'refs/tags/v') && github.ref_name || github.sha) }}
         run: sbt '++ ${{ matrix.scala }}' cli/assembly
 
       - name: Copy CLI
-        if: matrix.java == 'temurin@21' && matrix.scala == '3.7.3' && github.event_name == 'push'
+        if: matrix.java == 'temurin@25' && matrix.scala == '3.7.3' && github.event_name == 'push'
         run: |
           mkdir -p cli/artifacts/
           cp cli/target/scala-${{ matrix.scala }}/${{ format('find-unused-{0}.jar', startsWith(github.ref, 'refs/tags/v') && github.ref_name || github.sha) }} cli/artifacts/${{ format('find-unused-{0}.jar', startsWith(github.ref, 'refs/tags/v') && github.ref_name || github.sha) }}
 
       - name: Attest CLI
-        if: matrix.java == 'temurin@21' && matrix.scala == '3.7.3' && github.event_name == 'push'
+        if: matrix.java == 'temurin@25' && matrix.scala == '3.7.3' && github.event_name == 'push'
         uses: actions/attest-build-provenance@v2
         with:
           subject-path: cli/artifacts/${{ format('find-unused-{0}.jar', startsWith(github.ref, 'refs/tags/v') && github.ref_name || github.sha) }}
 
       - name: Upload CLI
-        if: matrix.java == 'temurin@21' && matrix.scala == '3.7.3' && github.event_name == 'push'
+        if: matrix.java == 'temurin@25' && matrix.scala == '3.7.3' && github.event_name == 'push'
         uses: actions/upload-artifact@v4
         with:
           name: ${{ format('find-unused-{0}.jar', startsWith(github.ref, 'refs/tags/v') && github.ref_name || github.sha) }}
@@ -111,7 +123,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [3.7.3]
-        java: [temurin@21]
+        java: [temurin@25]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)

build.sbt

@@ -11,8 +11,8 @@ lazy val scala37 = "3.7.3"
 
 ThisBuild / crossScalaVersions := Seq(scala2, scala37)
 
-val java21 = JavaSpec.temurin("21")
-val javaVersions = Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17"), java21)
+val java25 = JavaSpec.temurin("25")
+val javaVersions = Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17"), JavaSpec.temurin("21"), java25)
 
 val isTag = "startsWith(github.ref, 'refs/tags/v')"
 
@@ -41,7 +41,7 @@ ThisBuild / githubWorkflowPublishTargetBranches := Seq()
 def isJava(v: Int) = s"matrix.java == '${javaVersions.find(_.version == v.toString).get.render}'"
 def isScala(v: String) = s"matrix.scala == '$v'"
 
-val shouldBuildCLI = isJava(21) ++ " && " ++ isScala(scala37) ++ " && github.event_name == 'push'"
+val shouldBuildCLI = isJava(25) ++ " && " ++ isScala(scala37) ++ " && github.event_name == 'push'"
 
 ThisBuild / githubWorkflowBuild := Seq(
   WorkflowStep.Sbt(List("test", "scripted"), name = Some("scripted"), cond = Some(isScala(scala2))),
@@ -83,7 +83,7 @@ ThisBuild / githubWorkflowAddedJobs += WorkflowJob(
   id = "release",
   name = "Release",
   oses = List("ubuntu-latest"),
-  javas = List(java21),
+  javas = List(java25),
   scalas = List(scala37),
   cond = Some(isTag ++ " && github.event_name == 'push'"),
   needs = List("build"),