diff --git a/build.sbt b/build.sbt index 6b24109..80b92ff 100644 --- 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 index 40f5842..20539c3 100644 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -4,12 +4,15 @@ 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", @@ -17,7 +20,7 @@ object AppDependencies { ) 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 index 1e47ece..8678d8c 100644 --- 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 index dbae93b..c8fcab5 100644 --- 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 index 68dd1ab..97de479 100644 --- 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") \ No newline at end of file +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.9")