Merge pull request #4 from hmrc/PAS-452

PAS-452 Upgrade to Play 2.6
hmrc · Dec 17, 2018 · de67305 · de67305
2 parents 9110d1c + 332f1d5
commit de67305
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/app/uk/gov/hmrc/currencyconversion/controllers/ExchangeRateController.scala b/app/uk/gov/hmrc/currencyconversion/controllers/ExchangeRateController.scala
@@ -16,23 +16,24 @@
 
 package uk.gov.hmrc.currencyconversion.controllers
 
-import java.text.SimpleDateFormat
 import java.time.format.DateTimeFormatter
-import java.time.{LocalDate, LocalDateTime, ZonedDateTime}
-import java.util.{Date, Locale}
+import java.time.{LocalDate, ZonedDateTime}
 
 import javax.inject.{Inject, Singleton}
 import play.api.Logger
 import play.api.libs.json.Json
 import play.api.mvc._
 import uk.gov.hmrc.currencyconversion.models.ExchangeRateOldFileResult
 import uk.gov.hmrc.currencyconversion.services.ExchangeRateService
-import uk.gov.hmrc.play.bootstrap.controller.BaseController
+import uk.gov.hmrc.play.bootstrap.controller.BackendController
 
 import scala.concurrent.Future
 
 @Singleton()
-class ExchangeRateController @Inject()(exchangeRatesService: ExchangeRateService) extends BaseController {
+class ExchangeRateController @Inject() (
+  exchangeRatesService: ExchangeRateService,
+  controllerComponents: ControllerComponents
+) extends BackendController(controllerComponents) {
 
   def getRatesByCurrencyCode(cc: List[String], date: LocalDate): Action[AnyContent] = Action.async { implicit request =>
 

diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -7,15 +7,15 @@ object AppDependencies {
 
   val compile = Seq(
     ws,
-    "uk.gov.hmrc" %% "bootstrap-play-25" % "1.6.0"
+    "uk.gov.hmrc" %% "bootstrap-play-26" % "0.32.0"
   )
 
   def test(scope: String = "test,it") = Seq(
-    "uk.gov.hmrc" %% "hmrctest" % "3.0.0" % scope,
-    "org.scalatest" %% "scalatest" % "3.0.4" % scope,
+    "uk.gov.hmrc" %% "hmrctest" % "3.3.0" % scope,
+    "org.scalatest" %% "scalatest" % "3.0.5" % scope,
     "org.pegdown" % "pegdown" % "1.6.0" % scope,
     "org.mockito" % "mockito-all" % "2.0.2-beta" % "test",
-    "org.scalatestplus.play" %% "scalatestplus-play" % "2.0.1" % "test,it",
+    "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % "test,it",
     "com.typesafe.play" %% "play-test" % PlayVersion.current % scope
   )
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,11 +6,11 @@ addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "1.13.0")
 
 addSbtPlugin("uk.gov.hmrc" % "sbt-git-versioning" % "1.15.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "0.13.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-artifactory" % "0.14.0")
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "1.0.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "1.2.0")
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.12")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.20")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")