From 9c54691f81145fceed7e3bbcaa457e5759b541ba Mon Sep 17 00:00:00 2001 From: rdawson-hmrc <161580719+rdawson-hmrc@users.noreply.github.com> Date: Wed, 14 Aug 2024 13:23:50 +0100 Subject: [PATCH 1/3] HIPP-1328 - upgrade to scala 3 --- build.sbt | 2 +- conf/application.conf | 2 +- project/AppDependencies.scala | 4 ++-- project/plugins.sbt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 5b1d89f..0359863 100755 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import uk.gov.hmrc.DefaultBuildSettings ThisBuild / majorVersion := 0 -ThisBuild / scalaVersion := "2.13.12" +ThisBuild / scalaVersion := "3.3.3" lazy val microservice = Project("simple-api-deployment-stubs", file(".")) .enablePlugins(play.sbt.PlayScala, SbtDistributablesPlugin) diff --git a/conf/application.conf b/conf/application.conf index 1a0e1d0..c74fb8a 100755 --- a/conf/application.conf +++ b/conf/application.conf @@ -20,7 +20,7 @@ include "backend.conf" appName = simple-api-deployment-stubs # Default http client -play.modules.enabled += "uk.gov.hmrc.play.bootstrap.HttpClientModule" +play.modules.enabled += "uk.gov.hmrc.play.bootstrap.HttpClientV2Module" # Json error handler play.http.errorHandler = "uk.gov.hmrc.play.bootstrap.backend.http.JsonErrorHandler" diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index ddbd4fc..c0f0401 100755 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -5,11 +5,11 @@ import sbt._ object AppDependencies { - private val bootstrapVersion = "8.4.0" + private val bootstrapVersion = "9.3.0" val compile = Seq( "uk.gov.hmrc" %% "bootstrap-backend-play-30" % bootstrapVersion, - "io.swagger.parser.v3" % "swagger-parser" % "2.1.14" + "io.swagger.parser.v3" % "swagger-parser" % "2.1.14" // increasing version beyond this causes jackson-databind version conflicts ) val test = Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index d7acb47..0c06566 100755 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,5 +4,5 @@ resolvers += Resolver.typesafeRepo("releases") addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.22.0") addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.5.0") -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0") From b4a308ddff30bb636dc02d92a43e400a150f6a01 Mon Sep 17 00:00:00 2001 From: rdawson-hmrc <161580719+rdawson-hmrc@users.noreply.github.com> Date: Wed, 14 Aug 2024 13:31:23 +0100 Subject: [PATCH 2/3] HIPP-1328 - addressing PR bot comments --- conf/application-json-logger.xml | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100755 conf/application-json-logger.xml diff --git a/conf/application-json-logger.xml b/conf/application-json-logger.xml deleted file mode 100755 index 020356e..0000000 --- a/conf/application-json-logger.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - From db9ed5047122e64f60efc59a428cf0ce665de8cf Mon Sep 17 00:00:00 2001 From: rdawson-hmrc <161580719+rdawson-hmrc@users.noreply.github.com> Date: Wed, 14 Aug 2024 14:49:15 +0100 Subject: [PATCH 3/3] HIPP-1328 - addressing code review comments --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 0359863..2d80b52 100755 --- a/build.sbt +++ b/build.sbt @@ -13,6 +13,7 @@ lazy val microservice = Project("simple-api-deployment-stubs", file(".")) ) .settings(resolvers += Resolver.jcenterRepo) .settings(CodeCoverageSettings.settings: _*) + .settings(scalacOptions := scalacOptions.value.diff(Seq("-Wunused:all"))) lazy val it = project .enablePlugins(PlayScala)