Updating play 3.0 support. Fixes ReactiveMongo#564

* Removing local constant * Keep scala 2.12 as lower default * Formatting * Revert project name to Play2-ReactiveMongo * Add test to the pipeline
tardigradeus · Apr 30, 2024 · d93a860 · d93a860
1 parent 1738d22
commit d93a860
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -195,6 +195,26 @@ jobs:
       - store_test_results:
           path: test-reports
 
+  jdk11_scala213_play29:
+    docker:
+      - image: cchantep/circleci-openjdk:11-jdk
+
+    working_directory: ~/repo
+
+    environment:
+      RELEASE_SUFFIX: play29
+      PLAY_VERSION: 2.9.1
+      SCALA_VERSION: 2.13.11
+
+    steps:
+      - checkout
+      - setup_sbt
+      - setup_integration
+      - build_n_tests
+      - collect_test_reports
+      - store_test_results:
+          path: test-reports
+
   jdk11_scala32_play29:
     docker:
       - image: cchantep/circleci-openjdk:11-jdk
@@ -215,6 +235,46 @@ jobs:
       - store_test_results:
           path: test-reports
 
+  jdk11_scala213_play30:
+    docker:
+      - image: cchantep/circleci-openjdk:11-jdk
+
+    working_directory: ~/repo
+
+    environment:
+      RELEASE_SUFFIX: play30
+      PLAY_VERSION: 3.0.2
+      SCALA_VERSION: 2.13.11
+
+    steps:
+      - checkout
+      - setup_sbt
+      - setup_integration
+      - build_n_tests
+      - collect_test_reports
+      - store_test_results:
+          path: test-reports
+
+  jdk11_scala32_play30:
+    docker:
+      - image: cchantep/circleci-openjdk:11-jdk
+
+    working_directory: ~/repo
+
+    environment:
+      RELEASE_SUFFIX: play30
+      PLAY_VERSION: 3.0.2
+      SCALA_VERSION: 3.3.3
+
+    steps:
+      - checkout
+      - setup_sbt
+      - setup_integration
+      - build_n_tests
+      - collect_test_reports
+      - store_test_results:
+          path: test-reports
+
   publish_snapshots:
     docker:
       - image: cchantep/circleci-openjdk:8-jdk
@@ -254,6 +314,11 @@ jobs:
           play_version: 2.9.1
           scala_versions: 2.13.11 3.3.3
 
+      - publish_snapshots:
+          release_suffix: play30
+          play_version: 3.0.2
+          scala_versions: 2.13.11 3.3.3
+
       - save_cache:
           paths:
             - ~/.ivy2
@@ -280,7 +345,10 @@ workflows:
       - jdk8_scala212_play26
       - jdk10_scala213_play27
       - jdk11_scala213_play28
+      - jdk11_scala213_play29
       - jdk11_scala32_play29
+      - jdk11_scala213_play30
+      - jdk11_scala32_play30
 
       - publish_snapshots:
           filters:
@@ -292,6 +360,9 @@ workflows:
             - jdk10_scala213_play27
             - jdk11_scala213_play28
             - jdk11_scala32_play29
+            - jdk11_scala213_play29
+            - jdk11_scala32_play30
+            - jdk11_scala213_play30
 
       - trigger_dependent_builds:
           filters:

diff --git a/build.sbt b/build.sbt
@@ -41,7 +41,7 @@ val playDependencies = Def.setting[Seq[ModuleID]] {
   baseDeps
 }
 
-lazy val reactivemongo = Project("Play-ReactiveMongo", file(".")).settings(
+lazy val reactivemongo = Project("Play2-ReactiveMongo", file(".")).settings(
   Seq(
     resolvers ++= Resolver.sonatypeOssRepos({
       if (version.value endsWith "-SNAPSHOT") "snapshots"

diff --git a/project/Common.scala b/project/Common.scala
@@ -20,16 +20,13 @@ object Common extends AutoPlugin {
     driverVersion := {
       val ver = (ThisBuild / version).value
       val suffix = {
-        val noshaded = "noshaded"
-        val pekko = "pekko"
         (useShaded.value, playVer.value startsWith "2.") match {
-          case (false, false) => s"$noshaded.$pekko"
-          case (true, false) => pekko
-          case (false, true) => noshaded
+          case (false, false) => "noshaded.pekko"
+          case (true, false) => "pekko"
+          case (false, true) => "noshaded"
           case (true, true) => ""
         }
       }
-
       if (suffix.isEmpty) {
         ver
       } else {
@@ -53,22 +50,13 @@ object Common extends AutoPlugin {
         }
       }
     },
-    // Play 3 not supported in 2.11/2.12
-    scalaVersion := "2.13.11",
-    crossScalaVersions := {
-      val baseVersions = if (playVer.value startsWith "2.") {
-        Seq("2.11.12",
-          "2.12.17")
-      } else {
-        Seq.empty
-      }
-
-      baseVersions ++
-      Seq(
-        scalaVersion.value,
-        "3.2.2"
-      )
-    },
+    scalaVersion := "2.12.17",
+    crossScalaVersions := Seq(
+      "2.11.12",
+      scalaVersion.value,
+      "2.13.11",
+      "3.3.3"
+    ),
     crossVersion := CrossVersion.binary,
     Compile / compile / javacOptions ++= Seq(
       "-source",

diff --git a/project/build.sh b/project/build.sh
@@ -4,8 +4,8 @@ set -e
 
 S2_12="2.12.17"
 S2_11="2.11.12"
-S2_13="2.13.10"
-S3_2="3.2.2"
+S2_13="2.13.11"
+S3_3="3.3.3"
 
 unset REACTIVEMONGO_SHADED
 
@@ -27,4 +27,8 @@ sbt $SBT_OPTS ++${S2_12} makePom packageBin packageSrc packageDoc \
 
 export RELEASE_SUFFIX=play29 PLAY_VERSION=2.9.1
 sbt $SBT_OPTS ++${S2_13} makePom packageBin packageSrc packageDoc \
-  ++${S3_2} makePom packageBin packageSrc packageDoc
+  ++${S3_3} makePom packageBin packageSrc packageDoc
+
+export RELEASE_SUFFIX=play30 PLAY_VERSION=3.0.2
+sbt $SBT_OPTS ++${S2_13} makePom packageBin packageSrc packageDoc \
+  ++${S3_3} makePom packageBin packageSrc packageDoc