hmrc · Jan 16, 2024 · Jan 16, 2024 · Jan 31, 2024
diff --git a/build.sbt b/build.sbt
@@ -1,19 +1,24 @@
-import uk.gov.hmrc.playcrosscompilation.PlayVersion
+val scala2_13 = "2.13.12"
 
-val scala2_12 = "2.12.15"
-val scala2_13 = "2.13.7"
-
-val appName         = "play-ui"
-val silencerVersion = "1.7.7"
-
-lazy val root = Project(appName, file("."))
+lazy val root = Project("play-ui-play-30", file("."))
   .enablePlugins(SbtTwirl)
   .disablePlugins(JUnitXmlReportPlugin) // Required to prevent https://github.com/scalatest/scalatest/issues/1427
   .settings(
-    majorVersion := 9,
-    scalaVersion := scala2_12,
-    crossScalaVersions := Seq(scala2_12, scala2_13),
-    libraryDependencies ++= LibDependencies.libDependencies
+    majorVersion := 11,
+    scalaVersion := scala2_13,
+    crossScalaVersions := Seq(scala2_13),
+    libraryDependencies ++= Seq(
+      "org.playframework" %% "play"                 % "3.0.0",
+      "org.playframework" %% "play-filters-helpers" % "3.0.0",
+      "joda-time"          % "joda-time"            % "2.12.5",
+      "org.joda"           % "joda-convert"         % "2.0.2",
+      "org.apache.commons" % "commons-text"         % "1.9",
+      "org.scalatest"     %% "scalatest"            % "3.0.8"  % Test,
+      "org.pegdown"        % "pegdown"              % "1.6.0"  % Test,
+      "org.jsoup"          % "jsoup"                % "1.11.3" % Test,
+      "org.playframework" %% "play-test"            % "3.0.0"  % Test,
+      "org.scalacheck"    %% "scalacheck"           % "1.14.0" % Test
+    )
   )
   .settings(
     TwirlKeys.templateImports := Seq(
@@ -28,21 +33,9 @@ lazy val root = Project(appName, file("."))
       "_root_.play.twirl.api.TwirlFeatureImports._",
       "_root_.play.twirl.api.TwirlHelperImports._"
     ),
-    PlayCrossCompilation.playCrossCompilationSettings,
     isPublicArtefact := true,
-    // ***************
-    // Use the silencer plugin to suppress warnings from unused imports in compiled twirl templates
-    scalacOptions += "-P:silencer:pathFilters=views;routes",
-    libraryDependencies ++= Seq(
-      compilerPlugin("com.github.ghik" % "silencer-plugin" % silencerVersion cross CrossVersion.full),
-      "com.github.ghik" % "silencer-lib" % silencerVersion % Provided cross CrossVersion.full
-    ),
-    excludeFilter in unmanagedSources := {
-      if (PlayCrossCompilation.playVersion == PlayVersion.Play28)
-        "deprecatedPlay26Helpers.scala" || "BackwardsCompatibilityDIAndStaticSpec.scala"
-      else ""
-    }
-    // ***************
+    scalacOptions += "-Wconf:src=routes/.*:s",
+    scalacOptions += "-Wconf:src=views/.*:s"
   )
   .settings(TwirlKeys.constructorAnnotations += "@javax.inject.Inject()")
   .settings(unmanagedSourceDirectories in sbt.Compile += baseDirectory.value / "src/main/twirl")

diff --git a/project/LibDependencies.scala b/project/LibDependencies.scala
diff --git a/project/PlayCrossCompilation.scala b/project/PlayCrossCompilation.scala
diff --git a/project/build.properties b/project/build.properties
@@ -14,4 +14,4 @@
 # limitations under the License.
 #
 
-sbt.version=1.5.8
+sbt.version=1.9.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,10 +3,8 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact
   Resolver.ivyStylePatterns
 )
 
-addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.6.0")
+addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.19.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
-
-addSbtPlugin("uk.gov.hmrc" % "sbt-play-cross-compilation" % "2.3.0")
+addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.1")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
diff --git a/repository.yaml b/repository.yaml
@@ -1,2 +1,3 @@
 repoVisibility: public_0C3F0CE3E6E6448FAD341E7BFA50FCD333E06A20CFF05FCACE61154DDBBADF71
 deprecated: true
+description: Core for HMRC's UI, incl. formatters, validators, mappers and helper templates
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
@@ -1,4 +1,4 @@
-# Copyright 2022 HM Revenue & Customs
+# Copyright 2024 HM Revenue & Customs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/binders/ContinueUrl.scala b/src/main/scala/uk/gov/hmrc/play/binders/ContinueUrl.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/binders/NonBlankString.scala b/src/main/scala/uk/gov/hmrc/play/binders/NonBlankString.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/binders/Origin.scala b/src/main/scala/uk/gov/hmrc/play/binders/Origin.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/binders/PositiveInteger.scala b/src/main/scala/uk/gov/hmrc/play/binders/PositiveInteger.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/binders/QueryBinders.scala b/src/main/scala/uk/gov/hmrc/play/binders/QueryBinders.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/binders/SimpleObjectBinder.scala b/src/main/scala/uk/gov/hmrc/play/binders/SimpleObjectBinder.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/config/AccessibilityStatementConfig.scala b/src/main/scala/uk/gov/hmrc/play/config/AccessibilityStatementConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/config/AssetsConfig.scala b/src/main/scala/uk/gov/hmrc/play/config/AssetsConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/config/GTMConfig.scala b/src/main/scala/uk/gov/hmrc/play/config/GTMConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/config/OptimizelyConfig.scala b/src/main/scala/uk/gov/hmrc/play/config/OptimizelyConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/config/TrackingConsentConfig.scala b/src/main/scala/uk/gov/hmrc/play/config/TrackingConsentConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/deprecatedPlay26Helpers.scala b/src/main/scala/uk/gov/hmrc/play/deprecatedPlay26Helpers.scala
diff --git a/src/main/scala/uk/gov/hmrc/play/mappers/DateTuple.scala b/src/main/scala/uk/gov/hmrc/play/mappers/DateTuple.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/mappers/StopOnFirstFail.scala b/src/main/scala/uk/gov/hmrc/play/mappers/StopOnFirstFail.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/validators/Validators.scala b/src/main/scala/uk/gov/hmrc/play/validators/Validators.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 HM Revenue & Customs
+ * Copyright 2024 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/scala/uk/gov/hmrc/play/views/html/helpers/deprecatedPlay26Helpers.scala b/src/main/scala/uk/gov/hmrc/play/views/html/helpers/deprecatedPlay26Helpers.scala