BDOG-657 Build for play 2.7

hmrc · Mar 16, 2020 · 8e7a30d · 8e7a30d
1 parent 7aba832
commit 8e7a30d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,9 @@ matrix:
     - scala: 2.12.8
       env: PLAY_VERSION=2.6
       jdk: openjdk8
+    - scala: 2.12.8
+      env: PLAY_VERSION=2.7
+      jdk: openjdk8
 
 notifications:
   email:

diff --git a/project/LibraryDependencies.scala b/project/LibraryDependencies.scala
@@ -3,19 +3,20 @@ import sbt._
 object LibraryDependencies {
 
   private val play25Version = "2.5.19"
-  private val play26Version = "2.6.20"
+  private val play26Version = "2.6.23" // this version is pinned, since later versions are incompatible with the version of akka that reactivemongo was build with on scala 2.11.
+  private val play27Version = "2.7.4"
 
   val compile: Seq[ModuleID] = PlayCrossCompilation.dependencies(
     shared = Seq(
-      "com.github.nscala-time" %% "nscala-time"   % "2.22.0",
-      "org.reactivemongo"      %% "reactivemongo" % "0.20.2",
+      "com.github.nscala-time" %% "nscala-time"      % "2.22.0",
+      "org.reactivemongo"      %% "reactivemongo"    % "0.20.2",
+      "org.slf4j"              %  "slf4j-api"        % "1.7.26",
+      "org.slf4j"              %  "log4j-over-slf4j" % "1.7.26",
       // force commons-codec to avoid 1.13 and 1.14 until 1.15 is available
       // see JIRA ticket BDOG-612
       "commons-codec"          %  "commons-codec" % "1.12" force()
     ),
     play25 = Seq(
-      "org.slf4j"         % "slf4j-api"                % "1.7.26",
-      "org.slf4j"         % "log4j-over-slf4j"         % "1.7.26",
       "com.typesafe.play" %% "play"                    % play25Version,
       "org.reactivemongo" %% "reactivemongo-play-json" % "0.20.2-play25",
       // force dependencies due to security flaws found in jackson-databind < 2.9.x using XRay
@@ -28,11 +29,14 @@ object LibraryDependencies {
       "xerces" % "xercesImpl" % "2.12.0"
     ),
     play26 = Seq(
-      "org.slf4j"         % "slf4j-api"                % "1.7.26",
-      "org.slf4j"         % "log4j-over-slf4j"         % "1.7.26",
       "com.typesafe.play" %% "play"                    % play26Version,
       "com.typesafe.play" %% "play-guice"              % play26Version,
       "org.reactivemongo" %% "reactivemongo-play-json" % "0.20.2-play26"
+    ),
+    play27 = Seq(
+      "com.typesafe.play" %% "play"                    % play27Version,
+      "com.typesafe.play" %% "play-guice"              % play27Version,
+      "org.reactivemongo" %% "reactivemongo-play-json" % "0.20.2-play27"
     )
   )
 
@@ -52,6 +56,10 @@ object LibraryDependencies {
     play26 = Seq(
       "com.typesafe.play"      %% "play-test"          % play26Version % Test,
       "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2"       % Test
+    ),
+    play27 = Seq(
+      "com.typesafe.play"      %% "play-test"          % play27Version % Test,
+      "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2"       % Test
     )
   )
 }
diff --git a/project/PlayCrossCompilation.scala b/project/PlayCrossCompilation.scala
@@ -1,4 +1,12 @@
 import uk.gov.hmrc.playcrosscompilation.AbstractPlayCrossCompilation
-import uk.gov.hmrc.playcrosscompilation.PlayVersion.Play25
+import uk.gov.hmrc.playcrosscompilation.PlayVersion
 
-object PlayCrossCompilation extends AbstractPlayCrossCompilation(defaultPlayVersion = Play25)
+object PlayCrossCompilation extends AbstractPlayCrossCompilation(defaultPlayVersion = PlayVersion.Play25) {
+   override def playCrossScalaBuilds(scalaVersions: Seq[String]): Seq[String] =
+     playVersion match {
+       case PlayVersion.Play25 => scalaVersions.filter(version => version.startsWith("2.11"))
+       case PlayVersion.Play26 => scalaVersions
+       case PlayVersion.Play27 => // reactivemongo uses an old akka-version which is incompatible with the latter version of akka used in play 2.7. on scala 2.11
+                                  scalaVersions.filter(version => version.startsWith("2.12"))
+     }
+}
diff --git a/src/main/scala/reactivemongo/ReactiveMongoHelper.scala b/src/main/scala/reactivemongo/ReactiveMongoHelper.scala
@@ -18,11 +18,10 @@ package reactivemongo
 
 import reactivemongo.core.nodeset.Authenticate
 
-import scala.concurrent.{Await, ExecutionContext, Future}
+import scala.concurrent.{Await, ExecutionContext}
 import reactivemongo.api._
 
 import scala.concurrent.duration._
-import scala.language.postfixOps
 
 object ReactiveMongoHelper {
 

diff --git a/src/main/scala/uk/gov/hmrc/mongo/SimpleMongoConnection.scala b/src/main/scala/uk/gov/hmrc/mongo/SimpleMongoConnection.scala
@@ -19,7 +19,6 @@ package uk.gov.hmrc.mongo
 import reactivemongo.api.FailoverStrategy
 
 import scala.concurrent.duration.FiniteDuration
-import scala.language.postfixOps
 
 trait SimpleMongoConnection {