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

HIPP-1328 - upgrade to scala 3 #15

Merged
merged 3 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand Down
11 changes: 0 additions & 11 deletions conf/application-json-logger.xml

This file was deleted.

2 changes: 1 addition & 1 deletion conf/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions project/AppDependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")