Merge pull request #97 from hmrc/APID-520

APID-520: update dependencies/plugins and fix slash syntax warnings
hmrc · Sep 8, 2022 · c0f3a1f · c0f3a1f
2 parents 369d193 + 8705964
commit c0f3a1f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/build.sbt b/build.sbt
@@ -45,7 +45,7 @@ lazy val microservice = Project(appName, file("."))
   .settings(publishingSettings: _*)
   .settings(defaultSettings(): _*)
   .settings(acceptanceTestSettings: _*)
-  .settings(scalaVersion := "2.12.12")
+  .settings(scalaVersion := "2.12.15")
   .settings(ScoverageSettings())
   .settings(
     routesImport ++= Seq(
@@ -55,12 +55,12 @@ lazy val microservice = Project(appName, file("."))
   )
   .settings(
     libraryDependencies ++= AppDependencies(),
-    evictionWarningOptions in update := EvictionWarningOptions.default.withWarnScalaVersionEviction(false)
+    update / evictionWarningOptions := EvictionWarningOptions.default.withWarnScalaVersionEviction(false)
   )
   .settings(
-    fork in Test := false,
+    Test / fork := false,
     addTestReportOption(Test, "test-reports"),
-    parallelExecution in Test := false
+    Test / parallelExecution := false
   )
   .settings(majorVersion := 0)
   .settings(scalacOptions ++= Seq("-Ypartial-unification"))
@@ -69,9 +69,9 @@ lazy val acceptanceTestSettings =
   inConfig(AcceptanceTest)(Defaults.testSettings) ++
   inConfig(AcceptanceTest)(BloopDefaults.configSettings) ++
     Seq(
-      unmanagedSourceDirectories in AcceptanceTest := Seq(baseDirectory.value / "acceptance"),
-      fork in AcceptanceTest := false,
-      parallelExecution in AcceptanceTest := false,
+      AcceptanceTest / unmanagedSourceDirectories := Seq(baseDirectory.value / "acceptance"),
+      AcceptanceTest / fork := false,
+      AcceptanceTest / parallelExecution := false,
       addTestReportOption(AcceptanceTest, "acceptance-reports")
     )
 

diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -4,20 +4,23 @@ import play.core.PlayVersion
 object AppDependencies {
   def apply(): Seq[ModuleID] = dependencies ++ testDependencies
 
+  private lazy val mongoVersion = "0.70.0"
+  private lazy val bootstrapVersion = "7.2.0"
+
   private lazy val dependencies = Seq(
-    "uk.gov.hmrc"               %% "bootstrap-backend-play-28"        % "5.16.0",
-    "uk.gov.hmrc"               %% "simple-reactivemongo"             % "8.0.0-play-28",
+    "uk.gov.hmrc"               %% "bootstrap-backend-play-28"        % bootstrapVersion,
+    "uk.gov.hmrc"               %% "simple-reactivemongo"             % "8.1.0-play-28",
     "org.julienrf"              %% "play-json-derived-codecs"         % "6.0.0",
     "com.typesafe.play"         %% "play-json"                        % "2.9.2",
-    "uk.gov.hmrc"               %% "http-metrics"                     % "2.3.0-play-28",
+    "uk.gov.hmrc"               %% "http-metrics"                     % "2.5.0-play-28",
     "org.typelevel"             %% "cats-core"                        % "2.6.1",
     "eu.timepit"                %% "refined"                          % "0.9.13",
     "be.venneborg"              %% "play28-refined"                   % "0.6.0",
     "commons-validator"         %  "commons-validator"                % "1.6"
   )
 
   private lazy val testDependencies = Seq(
-    "uk.gov.hmrc"               %% "reactivemongo-test"               % "5.0.0-play-28",
+    "uk.gov.hmrc"               %% "reactivemongo-test"               % "5.1.0-play-28",
     "org.scalatestplus.play"    %% "scalatestplus-play"               % "3.1.3",
     "org.mockito"               %% "mockito-scala-scalatest"          % "1.16.42",
     "org.pegdown"               %  "pegdown"                          % "1.6.0",

diff --git a/project/ScoverageSettings.scala b/project/ScoverageSettings.scala
@@ -2,9 +2,9 @@ import scoverage.ScoverageKeys._
 
 object ScoverageSettings {
   def apply() = Seq(
-    coverageMinimum := 94.00,
+    coverageMinimumStmtTotal := 94.00,
+    coverageMinimumBranchTotal := 94.00,
     coverageFailOnMinimum := true,
-    coverageHighlighting := true,
 
     // Semicolon-separated list of regexs matching classes to exclude
     coverageExcludedPackages := Seq(

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.9
+sbt.version=1.6.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,10 +3,10 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy", url("https://open.artefacts
 
 resolvers += "Typesafe Releases" at "https://repo.typesafe.com/typesafe/releases/"
 
-addSbtPlugin("uk.gov.hmrc" %% "sbt-auto-build" % "3.5.0")
-addSbtPlugin("uk.gov.hmrc" %% "sbt-distributables" % "2.0.0")
-addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "1.5.1")
+addSbtPlugin("uk.gov.hmrc" %% "sbt-auto-build" % "3.8.0")
+addSbtPlugin("uk.gov.hmrc" %% "sbt-distributables" % "2.1.0")
+addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "2.0.0")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
 addSbtPlugin("com.typesafe.play" %% "sbt-plugin" % "2.8.7")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.9")
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.9")