Merge pull request #783 from playframework/mergify/bp/main/pr-418

[main] Revert "Temporary disable anorm example" (backport #418) by @mkurz
playframework · Nov 17, 2024 · 807983a · 807983a
2 parents d1965bf + 4fbe53f
commit 807983a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -287,19 +287,19 @@ jobs:
       cmd: |
         ./test.sh --sample=java/websocket --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
 
-#  scala-anorm:
-#    name: "Scala :: Anorm"
-#    uses: playframework/.github/.github/workflows/cmd.yml@v4
-#    needs: changes
-#    if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'scala-anorm')}}
-#    with:
-#      java: 17, 21
-#      scala: 2.13.x, 3.x
-#      gradle-build-root: scala/anorm
-#      add-dimensions: >-
-#        { "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
-#      cmd: |
-#        ./test.sh --sample=scala/anorm --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
+  scala-anorm:
+    name: "Scala :: Anorm"
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
+    needs: changes
+    if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'scala-anorm')}}
+    with:
+      java: 17, 21
+      scala: 2.13.x, 3.x
+      gradle-build-root: scala/anorm
+      add-dimensions: >-
+        { "server": [ "pekko", "netty"], "build_tool": ["sbt"] }
+      cmd: |
+        ./test.sh --sample=scala/anorm --backend-server=$MATRIX_SERVER --build-tool=$MATRIX_BUILD_TOOL
 
   scala-chatroom:
     name: "Scala :: Chatroom"
@@ -546,7 +546,7 @@ jobs:
       - "java-starter"
       - "java-streaming"
       - "java-websocket"
-#      - "scala-anorm"
+      - "scala-anorm"
       - "scala-chatroom"
       - "scala-compile-di"
       - "scala-fileupload"

diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt
@@ -6,14 +6,14 @@ lazy val root = (project in file("."))
   .settings(
     name := "play-scala-anorm-example",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.14", "3.3.3"),
+    crossScalaVersions := Seq("2.13.15", "3.3.3"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,
       jdbc,
       evolutions,
-      "com.h2database" % "h2" % "2.2.224",
-      "org.playframework.anorm" %% "anorm" % "2.7.0",
+      "com.h2database" % "h2" % "2.3.232",
+      "org.playframework.anorm" %% "anorm" % "2.8.1",
       "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
     ),
     scalacOptions ++= List("-feature", "-Werror"),

diff --git a/scala/anorm/project/plugins.sbt b/scala/anorm/project/plugins.sbt
@@ -1,2 +1,3 @@
 // The Play plugin
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
 addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
diff --git a/test.sh b/test.sh
@@ -86,7 +86,7 @@ else
   buildSample scala/streaming
   buildSample scala/websocket
   if [[ $build_tool == "sbt" ]]; then
-#    buildSample scala/anorm
+    buildSample scala/anorm
     buildSample java/grpc
     buildSample scala/grpc
     buildSample scala/isolated-slick