Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Commit e7bf02f

Browse files
authored
Merge pull request #15 from hmrc/HIPP-1328-scala-3-upgrade
HIPP-1328 - upgrade to scala 3
2 parents f4d5d41 + db9ed50 commit e7bf02f

File tree

5 files changed

+7
-17
lines changed

5 files changed

+7
-17
lines changed

build.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import uk.gov.hmrc.DefaultBuildSettings
22

33
ThisBuild / majorVersion := 0
4-
ThisBuild / scalaVersion := "2.13.12"
4+
ThisBuild / scalaVersion := "3.3.3"
55

66
lazy val microservice = Project("simple-api-deployment-stubs", file("."))
77
.enablePlugins(play.sbt.PlayScala, SbtDistributablesPlugin)
@@ -13,6 +13,7 @@ lazy val microservice = Project("simple-api-deployment-stubs", file("."))
1313
)
1414
.settings(resolvers += Resolver.jcenterRepo)
1515
.settings(CodeCoverageSettings.settings: _*)
16+
.settings(scalacOptions := scalacOptions.value.diff(Seq("-Wunused:all")))
1617

1718
lazy val it = project
1819
.enablePlugins(PlayScala)

conf/application-json-logger.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

conf/application.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include "backend.conf"
2020
appName = simple-api-deployment-stubs
2121

2222
# Default http client
23-
play.modules.enabled += "uk.gov.hmrc.play.bootstrap.HttpClientModule"
23+
play.modules.enabled += "uk.gov.hmrc.play.bootstrap.HttpClientV2Module"
2424

2525
# Json error handler
2626
play.http.errorHandler = "uk.gov.hmrc.play.bootstrap.backend.http.JsonErrorHandler"

project/AppDependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import sbt._
55

66
object AppDependencies {
77

8-
private val bootstrapVersion = "8.4.0"
8+
private val bootstrapVersion = "9.3.0"
99

1010
val compile = Seq(
1111
"uk.gov.hmrc" %% "bootstrap-backend-play-30" % bootstrapVersion,
12-
"io.swagger.parser.v3" % "swagger-parser" % "2.1.14"
12+
"io.swagger.parser.v3" % "swagger-parser" % "2.1.14" // increasing version beyond this causes jackson-databind version conflicts
1313
)
1414

1515
val test = Seq(

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ resolvers += Resolver.typesafeRepo("releases")
44

55
addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.22.0")
66
addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.5.0")
7-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")
8-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
7+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5")
8+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0")

0 commit comments

Comments
 (0)