Merge pull request #48 from hmrc/BDOG-2800

Bdog 2800 Play 3.0 upgrade
hmrc · Dec 6, 2023 · f3f739e · f3f739e
2 parents a85f38a + a2fb2a5
commit f3f739e
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 32 deletions.
diff --git a/app/assets/stylesheets/application-ie-8.scss b/app/assets/stylesheets/application-ie-8.scss
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
diff --git a/build.sbt b/build.sbt
@@ -1,16 +1,22 @@
+import uk.gov.hmrc.DefaultBuildSettings
 import uk.gov.hmrc.DefaultBuildSettings.integrationTestSettings
 import uk.gov.hmrc.sbtdistributables.SbtDistributablesPlugin.publishingSettings
 
+ThisBuild / majorVersion := 0
+ThisBuild / scalaVersion := "2.13.12"
+
 lazy val microservice = Project("platform-status-frontend", file("."))
   .enablePlugins(play.sbt.PlayScala, SbtDistributablesPlugin)
   .settings(
-    majorVersion        := 0,
     libraryDependencies ++= AppDependencies.compile ++ AppDependencies.test,
-    scalaVersion        := "2.13.10",
     scalacOptions       += "-Wconf:cat=unused-imports&src=html/.*:s",
     scalacOptions       += "-Wconf:src=routes/.*:s"
   )
-  .configs(IntegrationTest)
-  .settings(integrationTestSettings(): _*)
   .settings(resolvers += Resolver.jcenterRepo)
   .settings(PlayKeys.playDefaultPort := 8462)
+
+lazy val it = project
+  .enablePlugins(PlayScala)
+  .dependsOn(microservice % "test->test") // the "test->test" allows reusing test code and test dependencies
+  .settings(DefaultBuildSettings.itSettings)
+  .settings(libraryDependencies ++= AppDependencies.test)
diff --git a/conf/prod.routes b/conf/prod.routes
@@ -1,5 +1,3 @@
 # Add all the application routes to the app.routes file
 ->         /platform-status           app.Routes
 ->         /                          health.Routes
-
-GET        /admin/metrics             com.kenshoo.play.metrics.MetricsController.metrics
diff --git a/...ollers/AccessDeniedControllerITSpec.scala → ...ollers/AccessDeniedControllerITSpec.scala b/...ollers/AccessDeniedControllerITSpec.scala → ...ollers/AccessDeniedControllerITSpec.scala
diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -5,20 +5,20 @@ import sbt._
 
 object AppDependencies {
 
-val bootstrapVersion = "7.16.0"
+val bootstrapVersion = "8.1.0"
 
   val compile = Seq(
 
-    "uk.gov.hmrc"             %% "play-frontend-hmrc"          % "7.3.0-play-28",
-    "uk.gov.hmrc"             %% "bootstrap-frontend-play-28"  % bootstrapVersion,
+    "uk.gov.hmrc"             %% "play-frontend-hmrc-play-30"  % "8.1.0",
+    "uk.gov.hmrc"             %% "bootstrap-frontend-play-30"  % bootstrapVersion,
     "org.mongodb.scala"       %% "mongo-scala-driver"          % "4.8.2",
-    "org.typelevel"           %% "cats-core"                   % "2.6.1"
+    "org.typelevel"           %% "cats-core"                   % "2.10.0"
   )
 
   val test = Seq(
-    "uk.gov.hmrc"             %% "bootstrap-test-play-28"   % bootstrapVersion      % "test, it",
+    "uk.gov.hmrc"             %% "bootstrap-test-play-30"   % bootstrapVersion      % Test,
     "org.scalatestplus"       %% "scalacheck-1-14"          % "3.1.1.0"             % Test,
     "org.jsoup"               %  "jsoup"                    % "1.14.3"              % Test,
-    "org.mockito"             %% "mockito-scala-scalatest"  % "1.16.42"             % Test,
+    "org.mockito"             %% "mockito-scala-scalatest"  % "1.17.29"             % Test,
   )
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.9.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 resolvers += MavenRepository("HMRC-open-artefacts-maven2", "https://open.artefacts.tax.service.gov.uk/maven2")
 resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefacts.tax.service.gov.uk/ivy2"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("uk.gov.hmrc"       % "sbt-auto-build"     % "3.9.0")
-addSbtPlugin("uk.gov.hmrc"       % "sbt-distributables" % "2.2.0")
-addSbtPlugin("com.typesafe.play" % "sbt-plugin"         % "2.8.19")
-addSbtPlugin("org.irundaia.sbt"  % "sbt-sassify"        % "1.5.1" )
+addSbtPlugin("uk.gov.hmrc"         % "sbt-auto-build"     % "3.15.0")
+addSbtPlugin("uk.gov.hmrc"         % "sbt-distributables" % "2.4.0")
+addSbtPlugin("org.playframework"   % "sbt-plugin"         % "3.0.0")
+addSbtPlugin("io.github.irundaia"  % "sbt-sassify"        % "1.5.2" )
diff --git a/test/uk/gov/hmrc/platformstatusfrontend/controllers/MeasureControllerSpec.scala b/test/uk/gov/hmrc/platformstatusfrontend/controllers/MeasureControllerSpec.scala
@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.platformstatusfrontend.controllers
 
-import akka.stream.Materializer
+import org.apache.pekko.stream.Materializer
 import org.mockito.captor.ArgCaptor
 import org.mockito.scalatest.MockitoSugar
 import org.scalacheck.Gen
@@ -29,7 +29,7 @@ import play.api.http.Status
 import play.api.inject.guice.GuiceApplicationBuilder
 import play.api.test.FakeRequest
 import play.api.test.Helpers._
-import play.api. _
+import play.api._
 import uk.gov.hmrc.http.HeaderCarrier
 import uk.gov.hmrc.platformstatusfrontend.connectors.BackendConnector
 import uk.gov.hmrc.platformstatusfrontend.services.MeasureService

diff --git a/test/uk/gov/hmrc/platformstatusfrontend/controllers/StatusControllerSpec.scala b/test/uk/gov/hmrc/platformstatusfrontend/controllers/StatusControllerSpec.scala
@@ -20,11 +20,10 @@ import org.mockito.scalatest.MockitoSugar
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatestplus.play.guice.GuiceOneAppPerSuite
+import play.api._
 import play.api.http.Status
-import play.api.inject.guice.GuiceApplicationBuilder
 import play.api.test.FakeRequest
 import play.api.test.Helpers._
-import play.api._
 import uk.gov.hmrc.http.HeaderCarrier
 import uk.gov.hmrc.platformstatusfrontend.config.AppConfig
 import uk.gov.hmrc.platformstatusfrontend.services.{PlatformStatus, StatusChecker}

diff --git a/test/uk/gov/hmrc/platformstatusfrontend/filters/HeaderSizeFilterSpec.scala b/test/uk/gov/hmrc/platformstatusfrontend/filters/HeaderSizeFilterSpec.scala
@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.platformstatusfrontend.filters
 
-import akka.stream.Materializer
+import org.apache.pekko.stream.Materializer
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec

diff --git a/test/uk/gov/hmrc/platformstatusfrontend/services/AuditVolumeServiceSpec.scala b/test/uk/gov/hmrc/platformstatusfrontend/services/AuditVolumeServiceSpec.scala
@@ -33,7 +33,7 @@ class AuditVolumeServiceSpec
 
   val auditConnector = mock[AuditConnector]
   val fixture = new AuditVolumeService(auditConnector)
-  implicit val hc = HeaderCarrier()
+  implicit val hc: HeaderCarrier = HeaderCarrier()
 
   override def beforeEach(): Unit = {
     reset(auditConnector)

diff --git a/test/uk/gov/hmrc/platformstatusfrontend/services/ServiceVolumeServiceSpec.scala b/test/uk/gov/hmrc/platformstatusfrontend/services/ServiceVolumeServiceSpec.scala
@@ -31,7 +31,7 @@ class ServiceVolumeServiceSpec
 
   val connector = mock[GenericConnector]
   val fixture = new ServiceVolumeService(connector)
-  implicit val hc = HeaderCarrier()
+  implicit val hc: HeaderCarrier = HeaderCarrier()
 
   override def beforeEach(): Unit = {
     reset(connector)

diff --git a/test/uk/gov/hmrc/platformstatusfrontend/services/StatusCheckerSpec.scala b/test/uk/gov/hmrc/platformstatusfrontend/services/StatusCheckerSpec.scala
@@ -16,7 +16,7 @@
 
 package uk.gov.hmrc.platformstatusfrontend.services
 
-import akka.actor.ActorSystem
+import org.apache.pekko.actor.ActorSystem
 import org.mockito.scalatest.MockitoSugar
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers