h2 2.3.230 (was 2.2.224) (#605)

playframework · Aug 13, 2024 · f6549b8 · f6549b8
1 parent a4d4837
commit f6549b8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -28,7 +28,7 @@ jobs:
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       java: 8
-      scala: 2.11.x, 2.12.x, 2.13.x
+      scala: 2.11.x, 2.12.x
       cmd: sbt ++$MATRIX_SCALA docs/test
 
   check-docs-11:
@@ -39,21 +39,34 @@ jobs:
       scala: 2.11.x, 2.12.x, 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA docs/test
 
-  tests:
+  tests-8:
     name: Tests
     needs:
       - "check-code-style"
       - "check-binary-compatibility"
-      - "check-docs"
+      - "check-docs-8"
     uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 11, 8
+      java: 8
+      scala: 2.11.x, 2.12.x
+      cmd: sbt ++$MATRIX_SCALA publishLocal test
+
+  tests-11:
+    name: Tests
+    needs:
+      - "check-code-style"
+      - "check-binary-compatibility"
+      - "check-docs-11"
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
+    with:
+      java: 11
       scala: 2.11.x, 2.12.x, 2.13.x, 3.x
       cmd: sbt ++$MATRIX_SCALA publishLocal test
 
   finish:
     name: Finish
     if: github.event_name == 'pull_request'
     needs: # Should be last
-      - "tests"
+      - "tests-8"
+      - "tests-11"
     uses: playframework/.github/.github/workflows/rtm.yml@v4
diff --git a/build.sbt b/build.sbt
@@ -230,14 +230,24 @@ lazy val `anorm-core` = project
         ProblemFilters.exclude[IncompatibleMethTypeProblem]("anorm.ColumnNotFound.copy"),
         ProblemFilters.exclude[IncompatibleResultTypeProblem]("anorm.ColumnNotFound.copy$default$2")
       ),
-      libraryDependencies ++= Seq(
-        "joda-time"               % "joda-time"                % "2.12.7",
-        "org.joda"                % "joda-convert"             % "2.2.3",
-        "org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVer.value,
-        "org.scala-lang.modules" %% "scala-xml"                % xmlVer.value % Test,
-        "com.h2database"          % "h2"                       % "2.2.224"    % Test,
-        acolyte
-      ) ++ specs2Test,
+      libraryDependencies ++= {
+        val h2Ver = sys.props.get("java.version") match {
+          case Some(v) if v.startsWith("1.8") =>
+            "2.2.224"
+
+          case _ =>
+            "2.3.230"
+        }
+
+        Seq(
+          "joda-time"               % "joda-time"                % "2.12.7",
+          "org.joda"                % "joda-convert"             % "2.2.3",
+          "org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVer.value,
+          "org.scala-lang.modules" %% "scala-xml"                % xmlVer.value % Test,
+          "com.h2database"          % "h2"                       % h2Ver        % Test,
+          acolyte
+        ) ++ specs2Test
+      },
     ) ++ armShading ++ licensing
   )
   .dependsOn(`anorm-tokenizer`)