From 02613bcc8e8965ce1abb431eb0a13f972ecb72c6 Mon Sep 17 00:00:00 2001 From: John Green Date: Thu, 20 Aug 2026 08:21:40 +0100 Subject: [PATCH 1/2] API-9358: Upgrade libraries to Provided scope and use new DateFormatter --- project/AppDependencies.scala | 17 ++++++++++------- .../utils/AsyncHmrcSpec.scala | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index 659d532..4442350 100755 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -1,27 +1,30 @@ -import sbt._ +import sbt.* object AppDependencies { - private val bootstrapVersion = "10.7.0" - private val appDomainVersion = "1.2.0" - private val apiDomainVersion = "1.5.0" - private val tpdDomainVersion = "1.0.0" + private val bootstrapVersion = "10.8.0" + private val commonDomainVersion = "1.4.0" + private val appDomainVersion = "1.6.0" + private val apiDomainVersion = "1.8.0" + private val tpdDomainVersion = "1.3.0" private val mockitoScalaVersion = "2.2.1" def apply(): Seq[ModuleID] = compileDeps ++ testDeps val compileDeps = Seq( "uk.gov.hmrc" %% "bootstrap-backend-play-30" % bootstrapVersion, + "uk.gov.hmrc" %% "api-platform-common-domain" % commonDomainVersion, "uk.gov.hmrc" %% "api-platform-application-domain" % appDomainVersion, "uk.gov.hmrc" %% "api-platform-api-domain" % apiDomainVersion, "uk.gov.hmrc" %% "api-platform-tpd-domain" % tpdDomainVersion, - "uk.gov.hmrc" %% "internal-auth-client-play-30" % "4.3.0" + "uk.gov.hmrc" %% "internal-auth-client-play-30" % "4.4.0" ) val testDeps = Seq( "uk.gov.hmrc" %% "bootstrap-test-play-30" % bootstrapVersion, "org.mockito" %% "mockito-scala-scalatest" % mockitoScalaVersion, + "uk.gov.hmrc" %% "api-platform-common-domain-fixtures" % commonDomainVersion, "uk.gov.hmrc" %% "api-platform-application-domain-fixtures" % appDomainVersion, - "uk.gov.hmrc" %% "api-platform-test-tpd-domain" % tpdDomainVersion + "uk.gov.hmrc" %% "api-platform-tpd-domain-fixtures" % tpdDomainVersion ).map(_ % "test") } diff --git a/shared-test/uk/gov/hmrc/apiplatformadminapi/utils/AsyncHmrcSpec.scala b/shared-test/uk/gov/hmrc/apiplatformadminapi/utils/AsyncHmrcSpec.scala index 61cd9bc..f9afeb6 100644 --- a/shared-test/uk/gov/hmrc/apiplatformadminapi/utils/AsyncHmrcSpec.scala +++ b/shared-test/uk/gov/hmrc/apiplatformadminapi/utils/AsyncHmrcSpec.scala @@ -18,6 +18,6 @@ package uk.gov.hmrc.apiplatformadminapi.utils import play.api.test.{DefaultAwaitTimeout, FutureAwaits} -import uk.gov.hmrc.apiplatform.modules.common.utils +import uk.gov.hmrc.apiplatform.modules.common.utils.HmrcSpec -abstract class AsyncHmrcSpec extends utils.HmrcSpec with DefaultAwaitTimeout with FutureAwaits {} +abstract class AsyncHmrcSpec extends HmrcSpec with DefaultAwaitTimeout with FutureAwaits {} From c8da224181c0f96896f77a09e8136f2192fba1f0 Mon Sep 17 00:00:00 2001 From: John Green Date: Thu, 20 Aug 2026 13:34:46 +0100 Subject: [PATCH 2/2] API-9358: Mockito is supplied by common library --- project/AppDependencies.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala index 4442350..bcd7c7d 100755 --- a/project/AppDependencies.scala +++ b/project/AppDependencies.scala @@ -7,8 +7,7 @@ object AppDependencies { private val appDomainVersion = "1.6.0" private val apiDomainVersion = "1.8.0" private val tpdDomainVersion = "1.3.0" - private val mockitoScalaVersion = "2.2.1" - + def apply(): Seq[ModuleID] = compileDeps ++ testDeps val compileDeps = Seq( @@ -22,7 +21,6 @@ object AppDependencies { val testDeps = Seq( "uk.gov.hmrc" %% "bootstrap-test-play-30" % bootstrapVersion, - "org.mockito" %% "mockito-scala-scalatest" % mockitoScalaVersion, "uk.gov.hmrc" %% "api-platform-common-domain-fixtures" % commonDomainVersion, "uk.gov.hmrc" %% "api-platform-application-domain-fixtures" % appDomainVersion, "uk.gov.hmrc" %% "api-platform-tpd-domain-fixtures" % tpdDomainVersion