Drop JDK 11, use JDK 17, test JDK 21

AVSystem · May 6, 2024 · c25f3ca · c25f3ca
1 parent 48d440e
commit c25f3ca
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,20 +24,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.14]
-        java: [temurin@11]
+        java: [temurin@17, temurin@21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
+
+      - name: Setup Java (temurin@21)
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 21
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -74,20 +81,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.14]
-        java: [temurin@11]
+        java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
+      - name: Setup Java (temurin@17)
+        if: matrix.java == 'temurin@17'
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Setup Java (temurin@21)
+        if: matrix.java == 'temurin@21'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 21
 
       - name: Cache sbt
         uses: actions/cache@v2

diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ inThisBuild(Seq(
   scalaVersion := "2.13.14",
 
   githubWorkflowTargetTags ++= Seq("v*"),
-  githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")),
+  githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")),
   githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
 
   githubWorkflowPublish := Seq(WorkflowStep.Sbt(
@@ -22,7 +22,7 @@ inThisBuild(Seq(
 val CompileAndTest = "compile->compile;test->test"
 
 val parserCombinatorsVersion = "2.4.0"
-val avsCommonsVersion = "2.15.0"
+val avsCommonsVersion = "2.16.0"
 val jettyVersion = "9.4.54.v20240208" // Tests only
 val vaadinVersion = "6.8.18" // Tests only
 val slf4jVersion = "2.0.13"
@@ -44,8 +44,7 @@ lazy val subprojectSettings = Seq(
   crossVersion := CrossVersion.full,
 
   javacOptions ++= Seq(
-    "-source", "1.8",
-    "-target", "1.8",
+    "--release", "17",
     "-parameters"
   ),
 
@@ -61,12 +60,10 @@ lazy val subprojectSettings = Seq(
     "-Xlint:-missing-interpolator,-adapted-args,-unused,_"
   ),
 
-  scalacOptions ++= {
-    if (scalaBinaryVersion.value == "2.13") Seq(
-      "-Xnon-strict-patmat-analysis",
-      "-Xlint:-strict-unsealed-patmat"
-    ) else Seq.empty
-  },
+  scalacOptions ++= Seq(
+    "-Xnon-strict-patmat-analysis",
+    "-Xlint:-strict-unsealed-patmat"
+  ),
 
   sonatypeProfileName := "com.avsystem",
   publishTo := sonatypePublishToBundle.value,