add JDK 21 test

optics-dev · Oct 13, 2023 · e477782 · e477782
1 parent b36c91e
commit e477782
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,8 +29,13 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13, 3]
-        java: [temurin@8]
+        java: [temurin@8, temurin@21]
         project: [rootJS, rootJVM, rootNative]
+        exclude:
+          - project: rootJS
+            java: temurin@21
+          - project: rootNative
+            java: temurin@21
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -52,6 +57,19 @@ jobs:
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
         run: sbt +update
 
+      - name: Setup Java (temurin@21)
+        id: setup-java-temurin-21
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
+        run: sbt +update
+
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
 
@@ -125,6 +143,19 @@ jobs:
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
         run: sbt +update
 
+      - name: Setup Java (temurin@21)
+        id: setup-java-temurin-21
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
+        run: sbt +update
+
       - name: Download target directories (2.13, rootJS)
         uses: actions/download-artifact@v3
         with:
@@ -241,6 +272,19 @@ jobs:
         if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
         run: sbt +update
 
+      - name: Setup Java (temurin@21)
+        id: setup-java-temurin-21
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
+        run: sbt +update
+
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:

diff --git a/build.sbt b/build.sbt
@@ -28,6 +28,7 @@ inThisBuild(
       name = Some("Run documentation"),
       cond = Some(s"matrix.scala == '${scala2Version}' && matrix.project == 'rootJVM'")
     ),
+    githubWorkflowJavaVersions += JavaSpec.temurin("21"),
     githubWorkflowPublishPostamble += WorkflowStep.Sbt(
       List("docs/docusaurusPublishGhpages"),
       name = Some("Publish website"),

diff --git a/test/jvm/src/test/scala/monocle/PlatformSpecificTestInstances.scala b/test/jvm/src/test/scala/monocle/PlatformSpecificTestInstances.scala
@@ -3,10 +3,12 @@ package monocle
 import java.net.URL
 import org.scalacheck.{Arbitrary, Cogen, Gen}
 import cats.Eq
+import scala.annotation.nowarn
 
 private[monocle] trait PlatformSpecificTestInstances {
   implicit val urlEqual: Eq[URL] = Eq.instance((a, b) => a.toURI() == b.toURI())
 
+  @nowarn("msg=constructor URL in class URL is deprecated")
   implicit def urlArbitrary: Arbitrary[URL] =
     Arbitrary {
       val idGen = Gen.nonEmptyListOf(Gen.alphaChar).map(_.mkString)