Merge pull request #64 from hmrc/APIS-5455

APIS-5455 - Upgrade to 2.8

Author: peteslater-ee

app/config/CustomErrorHandler.scala

@@ -21,7 +21,7 @@ import play.api.Configuration
 import play.api.i18n.MessagesApi
 import play.api.mvc.Request
 import play.twirl.api.Html
-import uk.gov.hmrc.play.bootstrap.http.FrontendErrorHandler
+import uk.gov.hmrc.play.bootstrap.frontend.http.FrontendErrorHandler
 import views.html.error_template
 
 class CustomErrorHandler @Inject()(val messagesApi: MessagesApi,

app/connectors/DelegatedAuthorityConnector.scala

@@ -22,7 +22,7 @@ import javax.inject.{Inject, Singleton}
 import models.AppAuthorisation
 import uk.gov.hmrc.http._
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
-import uk.gov.hmrc.play.bootstrap.http.HttpClient
+import uk.gov.hmrc.http.HttpClient
 import uk.gov.hmrc.http.HttpReads.Implicits._
 import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.Future._

app/controllers/Revocation.scala

@@ -26,7 +26,7 @@ import play.api.mvc._
 import play.twirl.api.Html
 import service.RevocationService
 import uk.gov.hmrc.auth.core.{AuthConnector, AuthorisationException, AuthorisedFunctions}
-import uk.gov.hmrc.play.bootstrap.controller.FrontendController
+import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendController
 import views.html.error_template
 import views.html.revocation._
 

build.sbt

@@ -11,20 +11,6 @@ import bloop.integrations.sbt.BloopDefaults
 
 lazy val appName = "api-revocation-frontend"
 
-// Transitive dependencies in scalatest/scalatestplusplay drag in a newer version of jetty that is not
-// compatible with wiremock, so we need to pin the jetty stuff to the older version.
-// see https://groups.google.com/forum/#!topic/play-framework/HAIM1ukUCnI
-lazy val akkaVersion = "2.5.23"
-lazy val akkaHttpVersion = "10.0.15"
-
-val overrides: Seq[ModuleID] = Seq(
-  "com.typesafe.akka"           %% "akka-stream"        % akkaVersion,
-  "com.typesafe.akka"           %% "akka-protobuf"      % akkaVersion,
-  "com.typesafe.akka"           %% "akka-slf4j"         % akkaVersion,
-  "com.typesafe.akka"           %% "akka-actor"         % akkaVersion,
-  "com.typesafe.akka"           %% "akka-http-core"     % akkaHttpVersion
-)
-
 lazy val playSettings: Seq[Setting[_]] = Seq.empty
 lazy val microservice = (project in file("."))
   .enablePlugins(PlayScala, SbtAutoBuildPlugin, SbtDistributablesPlugin, SbtWeb)
@@ -40,7 +26,6 @@ lazy val microservice = (project in file("."))
     targetJvm := "jvm-1.8",
     scalaVersion := "2.12.12",
     libraryDependencies ++= AppDependencies(),
-    // dependencyOverrides ++= overrides,
     retrieveManaged := true,
     evictionWarningOptions in update := EvictionWarningOptions.default.withWarnScalaVersionEviction(false)
   )

project/AppDependencies.scala

@@ -5,23 +5,19 @@ object AppDependencies {
   def apply(): Seq[ModuleID] = compile ++ test
 
   lazy val compile = Seq(
-    "uk.gov.hmrc"               %% "play-partials"     % "6.9.0-play-26",
-    "uk.gov.hmrc"               %% "bootstrap-play-26" % "4.0.0",
-    "uk.gov.hmrc"               %% "play-ui"           % "8.12.0-play-26",
-    "uk.gov.hmrc"               %% "govuk-template"    % "5.48.0-play-26",
-    "org.apache.httpcomponents" %  "httpclient"        % "4.3.3",
-    "org.apache.httpcomponents" %  "httpcore"          % "4.3.3",
-    "com.typesafe.play"         %% "play-json-joda"    % "2.6.10"
+    "uk.gov.hmrc"               %% "bootstrap-frontend-play-28" % "5.16.0",
+    "uk.gov.hmrc"               %% "play-partials"              % "8.2.0-play-28",
+    "uk.gov.hmrc"               %% "play-ui"                    % "9.7.0-play-28",
+    "uk.gov.hmrc"               %% "govuk-template"             % "5.72.0-play-28",
+    "org.apache.httpcomponents" %  "httpclient"                 % "4.3.3",
+    "org.apache.httpcomponents" %  "httpcore"                   % "4.3.3",
+    "com.typesafe.play"         %% "play-json-joda"             % "2.8.1"
   )
 
   lazy val test = Seq(
-    "uk.gov.hmrc"             %% "hmrctest"                   % "3.9.0-play-26" % "test",
-    "org.scalatest"           %% "scalatest"                  % "3.0.8" % "test",
-    "org.scalatestplus.play"  %% "scalatestplus-play"         % "3.1.2" % "test",
-    "com.typesafe.play"       %% "play-test"                  % PlayVersion.current % "test",
-    "org.pegdown"             %  "pegdown"                    % "1.6.0" % "test",
-    "org.jsoup"               %  "jsoup"                      % "1.10.2" % "test",
-    "com.github.tomakehurst"  %  "wiremock-jre8-standalone"   % "2.24.1" % "test",
-    "org.mockito"             %% "mockito-scala-scalatest"    % "1.7.1",
-  )
+    "uk.gov.hmrc"               %% "bootstrap-test-play-28"     % "5.16.0",
+    "org.jsoup"                 %  "jsoup"                      % "1.10.2",
+    "com.github.tomakehurst"    %  "wiremock-jre8-standalone"   % "2.24.1",
+    "org.mockito"               %% "mockito-scala-scalatest"    % "1.7.1",
+  ).map(_ % "test")
 }

test/stubs/stubs.scala

@@ -18,22 +18,22 @@ package stubs
 
 import com.typesafe.config.{Config, ConfigFactory}
 import config.FrontendAppConfig
-import play.api.Mode.Test
 import play.api.http.{DefaultFileMimeTypes, FileMimeTypes, FileMimeTypesConfiguration}
 import play.api.i18n.{Langs, MessagesApi}
 import play.api.mvc._
 import play.api.test.Helpers.{stubBodyParser, stubPlayBodyParsers}
-import play.api.test.{CSRFTokenHelper, FakeRequest, NoMaterializer, StubMessagesFactory}
+import play.api.test.{CSRFTokenHelper, FakeRequest, StubMessagesFactory}
 import play.api.{Configuration, Environment}
-import uk.gov.hmrc.play.bootstrap.config.{RunMode, ServicesConfig}
+import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
 import uk.gov.hmrc.play.config.{AssetsConfig, GTMConfig, OptimizelyConfig, AccessibilityStatementConfig}
 import uk.gov.hmrc.play.views.html.helpers.ReportAProblemLink
-import uk.gov.hmrc.play.views.html.layouts.{BetaBanner, Footer, FooterLinks, GTMSnippet, Head, HeaderNav, MainContent, MainContentHeader, OptimizelySnippet, ServiceInfo, Sidebar}
+import uk.gov.hmrc.play.views.html.layouts.{BetaBanner, Footer, FooterLinks, GTMSnippet, Head, HeaderNav, MainContent, MainContentHeader, ServiceInfo, Sidebar}
 import views.html.layouts.GovUkTemplate
 import views.html.revocation.{authorizedApplications, loggedOut, permissionWithdrawn, start, withdrawPermission}
 import views.html.{error_template, govuk_wrapper, main_template}
 
 import scala.concurrent.ExecutionContext
+import akka.stream.testkit.NoMaterializer
 
 trait Stubs extends StubMessagesFactory {
 
@@ -80,14 +80,12 @@ trait Stubs extends StubMessagesFactory {
   val minimalConfiguration: Configuration = Configuration(minimalConfig)
   private val environment = Environment.simple()
 
-  private def runMode(conf: Configuration): RunMode = new RunMode(conf, Test)
-  private def servicesConfig(conf: Configuration) = new ServicesConfig(conf, runMode(conf))
+  private def servicesConfig(conf: Configuration) = new ServicesConfig(conf)
   private def appConfig(conf: Configuration) = new FrontendAppConfig(conf, environment, servicesConfig(conf))
 
   val minimalAppConfig: FrontendAppConfig = appConfig(minimalConfiguration)
 
   private val head: Head = new Head(
-    new OptimizelySnippet(new OptimizelyConfig(minimalConfiguration)),
     new AssetsConfig(minimalConfiguration),
     new GTMSnippet(new GTMConfig(minimalConfiguration))
   )

test/unit/connectors/DelegatedAuthorityConnectorSpec.scala

@@ -24,9 +24,8 @@ import models.{AppAuthorisation, Scope, ThirdPartyApplication}
 import org.joda.time.DateTime
 import utils._
 import uk.gov.hmrc.http.HeaderCarrier
-import uk.gov.hmrc.play.bootstrap.audit.DefaultAuditConnector
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
-import uk.gov.hmrc.play.bootstrap.http.HttpClient
+import uk.gov.hmrc.http.HttpClient
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import org.scalatestplus.play.guice.GuiceOneAppPerSuite
@@ -39,10 +38,8 @@ class DelegatedAuthorityConnectorSpec extends AsyncHmrcSpec with GuiceOneAppPerS
 
     implicit val hc = HeaderCarrier()
     val serviceConfig = mock[ServicesConfig]
-    val mockDefaultAuditConnector = mock[DefaultAuditConnector]
     val http = app.injector.instanceOf[HttpClient]
 
-
     val connector = new DelegatedAuthorityConnector(serviceConfig, http) {
       override val delegatedAuthorityUrl: String = wireMockUrl
     }

test/utils/HmrcSpec.scala

@@ -16,11 +16,13 @@
 
 package utils
 
-import org.scalatest.{Matchers, OptionValues, WordSpec}
+import org.scalatest.OptionValues
 import org.scalatestplus.play.WsScalaTestClient
 import play.api.test.{DefaultAwaitTimeout, FutureAwaits}
 import org.mockito.{ArgumentMatchersSugar, MockitoSugar}
+import org.scalatest.wordspec.AnyWordSpec
+import org.scalatest.matchers.should.Matchers
 
-abstract class HmrcSpec extends WordSpec with Matchers with OptionValues with WsScalaTestClient with MockitoSugar with ArgumentMatchersSugar
+abstract class HmrcSpec extends AnyWordSpec with Matchers with OptionValues with WsScalaTestClient with MockitoSugar with ArgumentMatchersSugar
 
 abstract class AsyncHmrcSpec extends HmrcSpec with DefaultAwaitTimeout with FutureAwaits {}