From ba013a7d0282f1e2a2b555a6b9c2f105bc2be852 Mon Sep 17 00:00:00 2001 From: Oscar Duignan <100650+oscarduignan@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:06:40 +0000 Subject: [PATCH 1/7] Remove play cross compilation --- build.sbt | 28 +++--- project/LibDependencies.scala | 52 ------------ project/PlayCrossCompilation.scala | 4 - project/build.properties | 2 +- project/plugins.sbt | 5 +- src/main/resources/reference.conf | 2 +- .../gov/hmrc/play/binders/ContinueUrl.scala | 2 +- .../hmrc/play/binders/NonBlankString.scala | 2 +- .../uk/gov/hmrc/play/binders/Origin.scala | 2 +- .../hmrc/play/binders/PositiveInteger.scala | 2 +- .../gov/hmrc/play/binders/QueryBinders.scala | 2 +- .../play/binders/SimpleObjectBinder.scala | 2 +- .../config/AccessibilityStatementConfig.scala | 2 +- .../gov/hmrc/play/config/AssetsConfig.scala | 2 +- .../uk/gov/hmrc/play/config/GTMConfig.scala | 2 +- .../hmrc/play/config/OptimizelyConfig.scala | 2 +- .../play/config/TrackingConsentConfig.scala | 2 +- .../hmrc/play/deprecatedPlay26Helpers.scala | 39 --------- .../uk/gov/hmrc/play/mappers/DateTuple.scala | 2 +- .../hmrc/play/mappers/StopOnFirstFail.scala | 2 +- .../gov/hmrc/play/validators/Validators.scala | 2 +- .../helpers/deprecatedPlay26Helpers.scala | 78 ----------------- .../layouts/deprecatedPlay26Helpers.scala | 85 ------------------- .../hmrc/play/views/formatting/Dates.scala | 2 +- .../hmrc/play/views/formatting/Money.scala | 2 +- .../hmrc/play/views/formatting/Strings.scala | 2 +- .../play/views/helpers/Address.scala.html | 2 +- .../play/views/helpers/AttorneyRegime.scala | 2 +- .../play/views/helpers/DateFields.scala.html | 2 +- .../helpers/DateFieldsFreeInline.scala.html | 2 +- .../DateFieldsFreeInlineLegend.scala.html | 2 +- .../helpers/DateFieldsFreeYear.scala.html | 2 +- .../DateFieldsFreeYearInline.scala.html | 2 +- .../views/helpers/DateFieldsInline.scala.html | 2 +- .../play/views/helpers/Dropdown.scala.html | 2 +- .../play/views/helpers/ErrorInline.scala.html | 2 +- .../helpers/ErrorNotifications.scala.html | 2 +- .../views/helpers/ErrorSummary.scala.html | 2 +- .../play/views/helpers/FieldGroup.scala.html | 2 +- .../views/helpers/FormWithCSRF.scala.html | 2 +- .../hmrc/play/views/helpers/Input.scala.html | 2 +- .../views/helpers/InputRadioGroup.scala.html | 2 +- .../views/helpers/RenderableMessage.scala | 2 +- .../helpers/ReportAProblemLink.scala.html | 2 +- .../views/helpers/SingleCheckbox.scala.html | 2 +- .../play/views/helpers/TextArea.scala.html | 2 +- .../gov/hmrc/play/views/helpers/model.scala | 2 +- .../play/views/layouts/Article.scala.html | 2 +- .../views/layouts/AttorneyBanner.scala.html | 2 +- .../play/views/layouts/BetaBanner.scala.html | 2 +- .../play/views/layouts/EuExitLinks.scala.html | 2 +- .../hmrc/play/views/layouts/Footer.scala.html | 2 +- .../play/views/layouts/FooterLinks.scala.html | 2 +- .../play/views/layouts/GTMSnippet.scala.html | 2 +- .../hmrc/play/views/layouts/Head.scala.html | 2 +- .../HeadWithTrackingConsent.scala.html | 2 +- .../play/views/layouts/HeaderNav.scala.html | 2 +- .../play/views/layouts/LoginStatus.scala.html | 2 +- .../play/views/layouts/MainContent.scala.html | 2 +- .../layouts/MainContentHeader.scala.html | 2 +- .../play/views/layouts/ServiceInfo.scala.html | 2 +- .../play/views/layouts/Sidebar.scala.html | 2 +- .../layouts/TrackingConsentSnippet.scala.html | 2 +- .../scala/uk/gov/hmrc/play/JsoupHelpers.scala | 2 +- .../uk/gov/hmrc/play/MessagesSupport.scala | 2 +- .../hmrc/play/binders/ContinueUrlSpec.scala | 2 +- .../play/binders/NonBlankStringSpec.scala | 2 +- .../uk/gov/hmrc/play/binders/OriginSpec.scala | 2 +- .../play/binders/PositiveIntegerSpec.scala | 2 +- .../play/binders/SimpleObjectBinderSpec.scala | 2 +- .../play/language/WelshMessagesSpec.scala | 2 +- .../gov/hmrc/play/mappers/DateTupleSpec.scala | 2 +- .../hmrc/play/validators/ValidatorsSpec.scala | 2 +- .../AccessibilityStatementConfigSpec.scala | 2 +- .../play/views/config/GTMConfigSpec.scala | 2 +- .../config/TrackingConsentConfigSpec.scala | 2 +- .../play/views/formatting/DatesSpec.scala | 2 +- .../play/views/formatting/StringsSpec.scala | 2 +- ...ackwardsCompatibilityDIAndStaticSpec.scala | 49 ----------- .../hmrc/play/views/helpers/CSRFSpec.scala | 2 +- .../play/views/helpers/DateFieldsSpec.scala | 2 +- .../play/views/helpers/DropDownSpec.scala | 2 +- .../play/views/helpers/FormWithCSRFSpec.scala | 2 +- .../views/helpers/InputRadioGroupSpec.scala | 2 +- .../hmrc/play/views/helpers/InputSpec.scala | 2 +- .../play/views/helpers/MoneyPoundsSpec.scala | 2 +- .../helpers/RenderableMoneyMessageSpec.scala | 2 +- .../views/helpers/SingleCheckboxSpec.scala | 2 +- ...ackwardsCompatibilityDIAndStaticSpec.scala | 46 ---------- .../play/views/layouts/BetaBannerSpec.scala | 2 +- .../play/views/layouts/EuExitLinksSpec.scala | 2 +- .../play/views/layouts/FooterLinksSpec.scala | 2 +- .../hmrc/play/views/layouts/FooterSpec.scala | 2 +- .../play/views/layouts/GTMSnippetSpec.scala | 2 +- .../hmrc/play/views/layouts/HeadSpec.scala | 2 +- .../layouts/HeadWithTrackingConsentSpec.scala | 49 ++++++----- .../play/views/layouts/LoginStatusSpec.scala | 2 +- .../play/views/layouts/ServiceInfoSpec.scala | 2 +- .../layouts/TrackingConsentSnippetSpec.scala | 40 ++++----- .../play/views/layouts/test/TestConfigs.scala | 2 +- .../uk/gov/hmrc/play/views/package.scala | 2 +- 101 files changed, 150 insertions(+), 505 deletions(-) delete mode 100644 project/LibDependencies.scala delete mode 100644 project/PlayCrossCompilation.scala delete mode 100644 src/main/scala/uk/gov/hmrc/play/deprecatedPlay26Helpers.scala delete mode 100644 src/main/scala/uk/gov/hmrc/play/views/html/helpers/deprecatedPlay26Helpers.scala delete mode 100644 src/main/scala/uk/gov/hmrc/play/views/html/layouts/deprecatedPlay26Helpers.scala delete mode 100644 src/test/scala/uk/gov/hmrc/play/views/helpers/BackwardsCompatibilityDIAndStaticSpec.scala delete mode 100644 src/test/scala/uk/gov/hmrc/play/views/layouts/BackwardsCompatibilityDIAndStaticSpec.scala diff --git a/build.sbt b/build.sbt index 9361f325..bbc68b52 100644 --- a/build.sbt +++ b/build.sbt @@ -1,19 +1,27 @@ -import uk.gov.hmrc.playcrosscompilation.PlayVersion - 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-28", file(".")) .enablePlugins(SbtTwirl) .disablePlugins(JUnitXmlReportPlugin) // Required to prevent https://github.com/scalatest/scalatest/issues/1427 .settings( majorVersion := 9, - scalaVersion := scala2_12, + scalaVersion := scala2_13, crossScalaVersions := Seq(scala2_12, scala2_13), - libraryDependencies ++= LibDependencies.libDependencies + libraryDependencies ++= Seq( + "com.typesafe.play" %% "play" % "2.8.7", + "com.typesafe.play" %% "filters-helpers" % "2.8.7", + "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, + "com.typesafe.play" %% "play-test" % "2.8.7" % Test, + "org.scalacheck" %% "scalacheck" % "1.14.0" % Test + ), + libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always // required since we're cross building for Play 2.8 which isn't compatible with sbt 1.9 ) .settings( TwirlKeys.templateImports := Seq( @@ -28,7 +36,6 @@ 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 @@ -36,12 +43,7 @@ lazy val root = Project(appName, file(".")) 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 "" - } + ) // *************** ) .settings(TwirlKeys.constructorAnnotations += "@javax.inject.Inject()") diff --git a/project/LibDependencies.scala b/project/LibDependencies.scala deleted file mode 100644 index 8ca06e02..00000000 --- a/project/LibDependencies.scala +++ /dev/null @@ -1,52 +0,0 @@ -import PlayCrossCompilation.dependencies -import sbt.{ModuleID, _} -import uk.gov.hmrc.playcrosscompilation.PlayVersion.{Play26, Play27, Play28} - -object LibDependencies { - - lazy val libDependencies: Seq[ModuleID] = dependencies( - shared = { - - val playVersion = PlayCrossCompilation.playVersion match { - case Play26 => "2.6.20" - case Play27 => "2.7.4" - case Play28 => "2.8.7" - } - - val compile = Seq( - "com.typesafe.play" %% "play" % playVersion, - "com.typesafe.play" %% "filters-helpers" % playVersion, - "org.joda" % "joda-convert" % "2.0.2", - "org.apache.commons" % "commons-text" % "1.9" - ) - - val test = Seq( - "org.scalatest" %% "scalatest" % "3.0.8", - "org.pegdown" % "pegdown" % "1.6.0", - "org.jsoup" % "jsoup" % "1.11.3", - "com.typesafe.play" %% "play-test" % playVersion, - "org.scalacheck" %% "scalacheck" % "1.14.0" - ).map(_ % Test) - - compile ++ test - }, - play26 = { - val test = Seq( - "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" - ).map(_ % Test) - test - }, - play27 = { - val test = Seq( - "org.scalatestplus.play" %% "scalatestplus-play" % "4.0.3" - ).map(_ % Test) - test - }, - play28 = { - val test = Seq( - "org.scalatestplus.play" %% "scalatestplus-play" % "4.0.3" - ).map(_ % Test) - test - } - ) -} diff --git a/project/PlayCrossCompilation.scala b/project/PlayCrossCompilation.scala deleted file mode 100644 index f8d8190c..00000000 --- a/project/PlayCrossCompilation.scala +++ /dev/null @@ -1,4 +0,0 @@ -import uk.gov.hmrc.playcrosscompilation.AbstractPlayCrossCompilation -import uk.gov.hmrc.playcrosscompilation.PlayVersion._ - -object PlayCrossCompilation extends AbstractPlayCrossCompilation(defaultPlayVersion = Play26) diff --git a/project/build.properties b/project/build.properties index c1af85f1..07abbe6d 100644 --- 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 index 27f87cce..9c2270cd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,10 +3,11 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact Resolver.ivyStylePatterns ) +// required since we're cross building for Play 2.8 which isn't compatible with sbt 1.9 +libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.6.0") addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1") -addSbtPlugin("uk.gov.hmrc" % "sbt-play-cross-compilation" % "2.3.0") - addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0") diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index d5a14f7c..f7625825 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -1,4 +1,4 @@ -# Copyright 2022 HM Revenue & Customs +# Copyright 2023 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 index ae0194ad..548eb6f7 100644 --- 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 2023 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 index 56fa304e..29f75a93 100644 --- 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 2023 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 index e9970654..f113ca41 100644 --- 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 2023 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 index 0577d0c9..9e3a4236 100644 --- 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 2023 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 index 0bfba223..94568af2 100644 --- 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 2023 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 index 74edd3c5..2e9627d7 100644 --- 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 2023 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 index 0a81cd0b..b792f41f 100644 --- 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 2023 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 index 25085e4d..299b06ae 100644 --- 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 2023 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 index 8e8fe3b0..e784d8b7 100644 --- 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 2023 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 index d02b531a..4258edaf 100644 --- 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 2023 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 index d7fdc1a7..9e1bb41b 100644 --- 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 2023 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 deleted file mode 100644 index a6ab3922..00000000 --- a/src/main/scala/uk/gov/hmrc/play/deprecatedPlay26Helpers.scala +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2022 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.gov.hmrc.play - -import play.api.Play - -package object config { - - @deprecated("Use DI", "7.26.0") - lazy val AssetsConfig: AssetsConfig = Play.current.injector.instanceOf[AssetsConfig] - - @deprecated("Use DI", "7.26.0") - lazy val OptimizelyConfig: OptimizelyConfig = Play.current.injector.instanceOf[OptimizelyConfig] - - @deprecated("Use DI", "7.26.0") - lazy val GTMConfig: GTMConfig = Play.current.injector.instanceOf[GTMConfig] - - @deprecated("Use DI", "7.26.0") - lazy val AccessibilityStatementConfig: AccessibilityStatementConfig = - Play.current.injector.instanceOf[AccessibilityStatementConfig] - - @deprecated("Use DI", "7.26.0") - lazy val TrackingConsentConfig: TrackingConsentConfig = - Play.current.injector.instanceOf[TrackingConsentConfig] -} diff --git a/src/main/scala/uk/gov/hmrc/play/mappers/DateTuple.scala b/src/main/scala/uk/gov/hmrc/play/mappers/DateTuple.scala index fa27a279..6679b164 100644 --- 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 2023 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 index 867875c7..a68b9379 100644 --- 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 2023 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 index fc32bafe..eb7fbe34 100644 --- 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 2023 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 deleted file mode 100644 index a03b2cec..00000000 --- a/src/main/scala/uk/gov/hmrc/play/views/html/helpers/deprecatedPlay26Helpers.scala +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2022 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.gov.hmrc.play.views.html - -package object helpers { - - /* - * Values added for backwards compatibility to not enforce DI. - */ - - @deprecated("Use DI") - lazy val address = new Address(input) - - @deprecated("Use DI") - lazy val dateFields = new DateFields(dateFieldsInline) - - @deprecated("Use DI") - lazy val dateFieldsFreeInline = new DateFieldsFreeInline(input) - - @deprecated("Use DI") - lazy val dateFieldsFreeInlineLegend = new DateFieldsFreeInlineLegend(input) - - @deprecated("Use DI") - lazy val dateFieldsFreeYearInline = new DateFieldsFreeYearInline(input, dropdown) - - @deprecated("Use DI") - lazy val dateFieldsFreeYear = new DateFieldsFreeYear(dateFieldsFreeYearInline) - - @deprecated("Use DI") - lazy val dateFieldsInline = new DateFieldsInline(dropdown) - - @deprecated("Use DI") - lazy val dropdown = new Dropdown() - - @deprecated("Use DI") - lazy val errorInline = new ErrorInline() - - @deprecated("Use DI") - lazy val error_notifications = new ErrorNotifications() - - @deprecated("Use DI") - lazy val errorSummary = new ErrorSummary() - - @deprecated("Use DI") - lazy val fieldGroup = new FieldGroup(dateFieldsInline, dropdown) - - @deprecated("Use DI") - lazy val form = new FormWithCSRF() - - @deprecated("Use DI") - lazy val input = new Input() - - @deprecated("Use DI") - lazy val input_radio_group = new InputRadioGroup() - - @deprecated("Use DI") - lazy val reportAProblemLink = new ReportAProblemLink() - - @deprecated("Use DI") - lazy val singleCheckbox = new SingleCheckbox() - - @deprecated("Use DI") - lazy val textArea = new TextArea() -} diff --git a/src/main/scala/uk/gov/hmrc/play/views/html/layouts/deprecatedPlay26Helpers.scala b/src/main/scala/uk/gov/hmrc/play/views/html/layouts/deprecatedPlay26Helpers.scala deleted file mode 100644 index 18d8b087..00000000 --- a/src/main/scala/uk/gov/hmrc/play/views/html/layouts/deprecatedPlay26Helpers.scala +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2022 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.gov.hmrc.play.views.html - -import play.api.Play -import uk.gov.hmrc.play.config.{AccessibilityStatementConfig, AssetsConfig, GTMConfig, OptimizelyConfig, TrackingConsentConfig} - -package object layouts { - - /* - * Values added for backwards compatibility to not enforce DI. - */ - - private lazy val assetsConfig = Play.current.injector.instanceOf[AssetsConfig] - - private lazy val optimizelyConfig = Play.current.injector.instanceOf[OptimizelyConfig] - - private lazy val gtmConfig = Play.current.injector.instanceOf[GTMConfig] - - private lazy val accessibilityStatementConfig = Play.current.injector.instanceOf[AccessibilityStatementConfig] - - private lazy val trackingConsentConfig = Play.current.injector.instanceOf[TrackingConsentConfig] - - @deprecated("Use DI") - lazy val article = new Article() - - @deprecated("Use DI") - lazy val attorney_banner = new AttorneyBanner() - - @deprecated("Use DI") - lazy val betaBanner = new BetaBanner() - - @deprecated("Use DI") - lazy val footer = new Footer(assetsConfig) - - @deprecated("Use DI") - lazy val eu_exit_links = new EuExitLinks() - - @deprecated("Use DI") - lazy val footer_links = new FooterLinks(accessibilityStatementConfig) - - @deprecated("Use DI") - lazy val head = new Head(assetsConfig, gtmSnippet) - - @deprecated("Use DI") - lazy val headWithTrackingConsent = new HeadWithTrackingConsent(trackingConsentSnippet, assetsConfig) - - @deprecated("Use DI") - lazy val header_nav = new HeaderNav() - - @deprecated("Use DI") - lazy val loginStatus = new LoginStatus() - - @deprecated("Use DI") - lazy val main_content = new MainContent() - - @deprecated("Use DI") - lazy val main_content_header = new MainContentHeader() - - @deprecated("Use DI") - lazy val gtmSnippet = new GTMSnippet(gtmConfig) - - @deprecated("Use DI") - lazy val trackingConsentSnippet = new TrackingConsentSnippet(trackingConsentConfig, optimizelyConfig) - - @deprecated("Use DI") - lazy val serviceInfo = new ServiceInfo() - - @deprecated("Use DI") - lazy val sidebar = new Sidebar() -} diff --git a/src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala index d77584c5..a20021ae 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/formatting/Money.scala b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala index 9e832840..ec794df2 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala index 40d79ab0..669ce950 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html index 0a70b392..1da09a84 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala b/src/main/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala index bb9d49a7..4830f1fa 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html index b11485ae..3654128f 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html index f218661c..0503311a 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html index 4a20ac40..f8f47320 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html index cff4cbfc..4cd13129 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html index a601a90a..237d7dd8 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html index 99cb0bb7..7f5f7c01 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html index 345fae82..ac1b0c2e 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html index c538017a..545ca7a4 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html index 42b8c13a..bed92491 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html index 9faec66d..ef4c4e5c 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html index 987236b7..2c4fe7db 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html index c5786efa..5e95432d 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html index c715e45a..cbd91539 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html index 5fd12726..472056e9 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala b/src/main/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala index 3ead1953..a5bd505c 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html index 2c74e26b..873f8edc 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html index 0f71bd73..16109667 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html index a1e173f9..9a5591f5 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/model.scala b/src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala index 9816610a..ad43a447 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html index 52db19f8..90f58d9f 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html index 26b1cd58..a3480122 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html index 40e75817..1fe3737e 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html index b26d8e81..4a15091f 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html index adf176f3..67294259 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html index bbc0632e..3ab4cace 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html index 46c7a312..f04c3b15 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html index 73329447..44a8f736 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html index ea1aacc2..757f205a 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html index 954dffbe..f00fe2e8 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html index eeebe4aa..a59643fc 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html index e3d42db1..b321b359 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html index 1a7baf4f..6cfafeb1 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html index 8ef93bc7..25214200 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html index 9278fd28..340dc67e 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html index 16c18123..8d4741bb 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala b/src/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala index 0d0f7a0c..acfca9ca 100644 --- a/src/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala +++ b/src/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/MessagesSupport.scala b/src/test/scala/uk/gov/hmrc/play/MessagesSupport.scala index 1140df66..c320395a 100644 --- a/src/test/scala/uk/gov/hmrc/play/MessagesSupport.scala +++ b/src/test/scala/uk/gov/hmrc/play/MessagesSupport.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala index d6fdf9ec..fbe6e3d3 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala index 76ad6064..9b54ee8a 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala index 845892ec..04811619 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala index 5e8e52cf..7571aaac 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala index 43876f04..7ddfbd2f 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala b/src/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala index 679a2797..a9d318eb 100644 --- a/src/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala b/src/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala index 831efadb..b0b45625 100644 --- a/src/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala b/src/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala index 7273f9a0..fae556cf 100644 --- a/src/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala index 32c31fbc..9d0d42f2 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala index a029182c..bb244046 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala index 7e9c013a..9fe28f6a 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala index 693976dc..8ec12097 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala index 07fe9bdc..221429e4 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/BackwardsCompatibilityDIAndStaticSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/BackwardsCompatibilityDIAndStaticSpec.scala deleted file mode 100644 index f220f094..00000000 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/BackwardsCompatibilityDIAndStaticSpec.scala +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2022 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.gov.hmrc.play.views.helpers - -import org.scalatest.{Matchers, WordSpec} - -/* - * Verifies that old pre play 2.6 way of accessing templates - * continues to work after we've made them injectable. - */ -class BackwardsCompatibilityDIAndStaticSpec extends WordSpec with Matchers { - - import uk.gov.hmrc.play.views.html.helpers._ - - "It should be possible to access templates without DI" in { - errorInline shouldBe an[ErrorInline] - dropdown shouldBe a[Dropdown] - dateFieldsInline shouldBe a[DateFieldsInline] - dateFields shouldBe a[DateFields] - dateFieldsFreeInline shouldBe a[DateFieldsFreeInline] - fieldGroup shouldBe a[FieldGroup] - address shouldBe an[Address] - dateFieldsFreeInlineLegend shouldBe a[DateFieldsFreeInlineLegend] - dateFieldsFreeYear shouldBe a[DateFieldsFreeYear] - dateFieldsFreeYearInline shouldBe a[DateFieldsFreeYearInline] - error_notifications shouldBe an[ErrorNotifications] - errorSummary shouldBe an[ErrorSummary] - form shouldBe a[FormWithCSRF] - input shouldBe an[Input] - reportAProblemLink shouldBe a[ReportAProblemLink] - singleCheckbox shouldBe a[SingleCheckbox] - textArea shouldBe a[TextArea] - } - -} diff --git a/src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala index 6e170d2b..c6f3810b 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala index d8e1702e..41a14c9a 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala index 56ea9d64..06e30977 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala index 960b79e1..46a6fc62 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala index 507de187..df855d5d 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala index 34352532..17c97a20 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala index 54f87328..e1095c2e 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala index 72d68be2..a72a116e 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala index ca530344..8d6c0315 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/BackwardsCompatibilityDIAndStaticSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/BackwardsCompatibilityDIAndStaticSpec.scala deleted file mode 100644 index 2ee02d65..00000000 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/BackwardsCompatibilityDIAndStaticSpec.scala +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2022 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.gov.hmrc.play.views.layouts - -import org.scalatest.{Matchers, WordSpec} -import org.scalatestplus.play.guice.GuiceOneAppPerSuite -import play.api.Application -import play.api.inject.guice.GuiceApplicationBuilder - -/* - * Verifies that old pre play 2.6 way of accessing templates - * continues to work after we've made them injectable. - */ -class BackwardsCompatibilityDIAndStaticSpec extends WordSpec with Matchers with GuiceOneAppPerSuite { - import uk.gov.hmrc.play.views.html.layouts._ - - override def fakeApplication(): Application = - new GuiceApplicationBuilder().configure(Map("play.allowGlobalApplication" -> "true")).build() - - "It should be possible to access templates without DI" in { - article shouldBe an[Article] - attorney_banner shouldBe an[AttorneyBanner] - betaBanner shouldBe a[BetaBanner] - footer_links shouldBe a[FooterLinks] - header_nav shouldBe a[HeaderNav] - loginStatus shouldBe a[LoginStatus] - main_content shouldBe a[MainContent] - main_content_header shouldBe a[MainContentHeader] - serviceInfo shouldBe a[ServiceInfo] - sidebar shouldBe a[Sidebar] - } -} diff --git a/src/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala index fc5481f0..d6c424f5 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala index 1092c003..74b25799 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala index fe1ababf..364bb73b 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala index a2481af5..d2b7cf9f 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala index 5ffe85c5..16d67d29 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala index d5392c16..31450f7c 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala index b034fe03..d1ed6998 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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. @@ -17,36 +17,35 @@ package uk.gov.hmrc.play.views.layouts import org.scalatest.{Matchers, WordSpec} -import org.scalatestplus.play.guice.GuiceOneAppPerSuite -import play.api.Application +import play.api.{Configuration, Environment} import play.api.i18n.{Lang, Messages} -import play.api.inject.guice.GuiceApplicationBuilder import play.twirl.api.Html -import uk.gov.hmrc.play.views.html.layouts.HeadWithTrackingConsent +import uk.gov.hmrc.play.config.{AssetsConfig, OptimizelyConfig, TrackingConsentConfig} +import uk.gov.hmrc.play.views.html.layouts.{HeadWithTrackingConsent, TrackingConsentSnippet} import uk.gov.hmrc.play.{JsoupHelpers, MessagesSupport} -class HeadWithTrackingConsentSpec - extends WordSpec - with Matchers - with GuiceOneAppPerSuite - with JsoupHelpers - with MessagesSupport { - override def fakeApplication(): Application = - new GuiceApplicationBuilder() - .configure( - Map( - "play.allowGlobalApplication" -> "true", - "optimizely.url" -> "https://cdn.optimizely.com/", - "optimizely.projectId" -> "1234567", - "tracking-consent-frontend.gtm.container" -> "d", - "assets.url" -> "doesnt-matter", - "assets.version" -> "doesnt-matter" - ) - ) - .build() +class HeadWithTrackingConsentSpec extends WordSpec with Matchers with JsoupHelpers with MessagesSupport { "HeadWithTrackingConsent" should { - val headWithTrackingConsent = app.injector.instanceOf[HeadWithTrackingConsent] + val config = Configuration.load( + Environment.simple(), + Map( + "play.allowGlobalApplication" -> "true", + "optimizely.url" -> "https://cdn.optimizely.com/", + "optimizely.projectId" -> "1234567", + "tracking-consent-frontend.gtm.container" -> "d", + "assets.url" -> "doesnt-matter", + "assets.version" -> "doesnt-matter" + ) + ) + + val headWithTrackingConsent = new HeadWithTrackingConsent( + new TrackingConsentSnippet( + new TrackingConsentConfig(config), + new OptimizelyConfig(config) + ), + new AssetsConfig(config) + ) val linkElem = Some(Html("")) val headScripts = Some(Html("")) diff --git a/src/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala index 19b755c9..faa67ef6 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala index 65f7fada..407e2f48 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala index 998f9f16..8a905e2d 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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. @@ -17,33 +17,29 @@ package uk.gov.hmrc.play.views.layouts import org.scalatest.{Matchers, WordSpec} -import org.scalatestplus.play.guice.GuiceOneAppPerSuite -import play.api.Application +import play.api.{Configuration, Environment} import play.api.i18n.{Lang, Messages} -import play.api.inject.guice.GuiceApplicationBuilder +import uk.gov.hmrc.play.config.{OptimizelyConfig, TrackingConsentConfig} import uk.gov.hmrc.play.views.html.layouts.TrackingConsentSnippet import uk.gov.hmrc.play.{JsoupHelpers, MessagesSupport} -class TrackingConsentSnippetSpec - extends WordSpec - with Matchers - with GuiceOneAppPerSuite - with JsoupHelpers - with MessagesSupport { - override def fakeApplication(): Application = - new GuiceApplicationBuilder() - .configure( - Map( - "play.allowGlobalApplication" -> "true", - "optimizely.url" -> "https://cdn.optimizely.com/", - "optimizely.projectId" -> "1234567", - "tracking-consent-frontend.gtm.container" -> "d" - ) - ) - .build() +class TrackingConsentSnippetSpec extends WordSpec with Matchers with JsoupHelpers with MessagesSupport { "TrackingConsentSnippet" should { - val trackingConsentSnippet = app.injector.instanceOf[TrackingConsentSnippet] + val config = Configuration.load( + Environment.simple(), + Map( + "play.allowGlobalApplication" -> "true", + "optimizely.url" -> "https://cdn.optimizely.com/", + "optimizely.projectId" -> "1234567", + "tracking-consent-frontend.gtm.container" -> "d" + ) + ) + + val trackingConsentSnippet = new TrackingConsentSnippet( + new TrackingConsentConfig(config), + new OptimizelyConfig(config) + ) "include the tracking consent script tag" in { val content = trackingConsentSnippet() diff --git a/src/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala index bebc9460..30173d35 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/package.scala b/src/test/scala/uk/gov/hmrc/play/views/package.scala index 11faa352..1a2d10b9 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/package.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/package.scala @@ -1,5 +1,5 @@ /* - * Copyright 2022 HM Revenue & Customs + * Copyright 2023 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. From f8b7e6ddc56eb8e9ae997d2f7a52764d0e27bf0c Mon Sep 17 00:00:00 2001 From: Oscar Duignan <100650+oscarduignan@users.noreply.github.com> Date: Mon, 4 Dec 2023 09:48:17 +0000 Subject: [PATCH 2/7] build for play2.9 --- build.sbt | 27 +++++++++++++-------------- project/plugins.sbt | 7 ++----- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/build.sbt b/build.sbt index bbc68b52..8703437e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,27 +1,26 @@ -val scala2_12 = "2.12.15" val scala2_13 = "2.13.7" val silencerVersion = "1.7.7" -lazy val root = Project("play-ui-play-28", file(".")) +lazy val root = Project("play-ui-play-29", file(".")) .enablePlugins(SbtTwirl) .disablePlugins(JUnitXmlReportPlugin) // Required to prevent https://github.com/scalatest/scalatest/issues/1427 .settings( majorVersion := 9, scalaVersion := scala2_13, - crossScalaVersions := Seq(scala2_12, scala2_13), + crossScalaVersions := Seq(scala2_13), libraryDependencies ++= Seq( - "com.typesafe.play" %% "play" % "2.8.7", - "com.typesafe.play" %% "filters-helpers" % "2.8.7", - "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, - "com.typesafe.play" %% "play-test" % "2.8.7" % Test, - "org.scalacheck" %% "scalacheck" % "1.14.0" % Test - ), - libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always // required since we're cross building for Play 2.8 which isn't compatible with sbt 1.9 + "com.typesafe.play" %% "play" % "2.9.0", + "com.typesafe.play" %% "play-filters-helpers" % "2.9.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, + "com.typesafe.play" %% "play-test" % "2.9.0" % Test, + "org.scalacheck" %% "scalacheck" % "1.14.0" % Test + ) ) .settings( TwirlKeys.templateImports := Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index 9c2270cd..ac3e823a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,11 +3,8 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact Resolver.ivyStylePatterns ) -// required since we're cross building for Play 2.8 which isn't compatible with sbt 1.9 -libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always +addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.15.0") -addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.6.0") - -addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1") +addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0") From a4f5ec6234a7b75a19478963bba07f2acba8f3a7 Mon Sep 17 00:00:00 2001 From: Oscar Duignan <100650+oscarduignan@users.noreply.github.com> Date: Mon, 4 Dec 2023 09:57:43 +0000 Subject: [PATCH 3/7] build for play3.0 --- build.sbt | 8 ++++---- project/plugins.sbt | 4 ++-- src/test/scala/uk/gov/hmrc/play/views/package.scala | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 8703437e..04ab9adc 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ val scala2_13 = "2.13.7" val silencerVersion = "1.7.7" -lazy val root = Project("play-ui-play-29", 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( @@ -10,15 +10,15 @@ lazy val root = Project("play-ui-play-29", file(".")) scalaVersion := scala2_13, crossScalaVersions := Seq(scala2_13), libraryDependencies ++= Seq( - "com.typesafe.play" %% "play" % "2.9.0", - "com.typesafe.play" %% "play-filters-helpers" % "2.9.0", + "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, - "com.typesafe.play" %% "play-test" % "2.9.0" % Test, + "org.playframework" %% "play-test" % "3.0.0" % Test, "org.scalacheck" %% "scalacheck" % "1.14.0" % Test ) ) diff --git a/project/plugins.sbt b/project/plugins.sbt index ac3e823a..3bc6d3be 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,8 +3,8 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact Resolver.ivyStylePatterns ) -addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.15.0") +addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.18.0") -addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.1") +addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0") diff --git a/src/test/scala/uk/gov/hmrc/play/views/package.scala b/src/test/scala/uk/gov/hmrc/play/views/package.scala index 1a2d10b9..746702ca 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/package.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/package.scala @@ -16,7 +16,7 @@ package uk.gov.hmrc.play -import akka.util.Timeout +import org.apache.pekko.util.Timeout import org.jsoup.Jsoup import org.jsoup.nodes.Document import play.api.test.Helpers.contentAsString From cbc64ce451c91f37110c1584342f8ce0d4a0a48d Mon Sep 17 00:00:00 2001 From: Kyle Bowden <1393788+kyle-bowden@users.noreply.github.com> Date: Tue, 16 Jan 2024 11:35:26 +0000 Subject: [PATCH 4/7] PLATUI-2716: play-ui has release for Play 2.9 --- build.sbt | 10 +++++----- src/test/scala/uk/gov/hmrc/play/views/package.scala | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 04ab9adc..aaba8cac 100644 --- a/build.sbt +++ b/build.sbt @@ -2,23 +2,23 @@ val scala2_13 = "2.13.7" val silencerVersion = "1.7.7" -lazy val root = Project("play-ui-play-30", file(".")) +lazy val root = Project("play-ui-play-29", file(".")) .enablePlugins(SbtTwirl) .disablePlugins(JUnitXmlReportPlugin) // Required to prevent https://github.com/scalatest/scalatest/issues/1427 .settings( - majorVersion := 9, + majorVersion := 10, scalaVersion := scala2_13, crossScalaVersions := Seq(scala2_13), libraryDependencies ++= Seq( - "org.playframework" %% "play" % "3.0.0", - "org.playframework" %% "play-filters-helpers" % "3.0.0", + "com.typesafe.play" %% "play" % "2.9.0", + "com.typesafe.play" %% "play-filters-helpers" % "2.9.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, + "com.typesafe.play" %% "play-test" % "2.9.0" % Test, "org.scalacheck" %% "scalacheck" % "1.14.0" % Test ) ) diff --git a/src/test/scala/uk/gov/hmrc/play/views/package.scala b/src/test/scala/uk/gov/hmrc/play/views/package.scala index 746702ca..1a2d10b9 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/package.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/package.scala @@ -16,7 +16,7 @@ package uk.gov.hmrc.play -import org.apache.pekko.util.Timeout +import akka.util.Timeout import org.jsoup.Jsoup import org.jsoup.nodes.Document import play.api.test.Helpers.contentAsString From 3b8bcc39a922765e8f360ae45ab9a121a7ccb0d7 Mon Sep 17 00:00:00 2001 From: JoPintoPaul Date: Tue, 16 Jan 2024 14:06:30 +0000 Subject: [PATCH 5/7] PLATUI-2716: Updated Scala version and sbt-auto-build version --- build.sbt | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index aaba8cac..15012ca6 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val scala2_13 = "2.13.7" +val scala2_13 = "2.13.12" val silencerVersion = "1.7.7" diff --git a/project/plugins.sbt b/project/plugins.sbt index 3bc6d3be..80bf80e7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact Resolver.ivyStylePatterns ) -addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.18.0") +addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.19.0") addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.1") From f802b63c471c9a9fc7b784442afc919f31515ea3 Mon Sep 17 00:00:00 2001 From: JoPintoPaul Date: Tue, 16 Jan 2024 14:16:00 +0000 Subject: [PATCH 6/7] PLATUI-2716: Removed silencer plugin --- build.sbt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 15012ca6..9edb7d8e 100644 --- a/build.sbt +++ b/build.sbt @@ -36,14 +36,8 @@ lazy val root = Project("play-ui-play-29", file(".")) "_root_.play.twirl.api.TwirlHelperImports._" ), 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 - ) - // *************** + 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") From 75bb599a3cc046caf337270ed6730cb3580e00bc Mon Sep 17 00:00:00 2001 From: JoPintoPaul Date: Tue, 16 Jan 2024 14:31:05 +0000 Subject: [PATCH 7/7] PLATUI-2716: Copyright headers to 2024 --- src/main/resources/reference.conf | 2 +- src/main/scala/uk/gov/hmrc/play/binders/ContinueUrl.scala | 2 +- src/main/scala/uk/gov/hmrc/play/binders/NonBlankString.scala | 2 +- src/main/scala/uk/gov/hmrc/play/binders/Origin.scala | 2 +- src/main/scala/uk/gov/hmrc/play/binders/PositiveInteger.scala | 2 +- src/main/scala/uk/gov/hmrc/play/binders/QueryBinders.scala | 2 +- .../scala/uk/gov/hmrc/play/binders/SimpleObjectBinder.scala | 2 +- .../uk/gov/hmrc/play/config/AccessibilityStatementConfig.scala | 2 +- src/main/scala/uk/gov/hmrc/play/config/AssetsConfig.scala | 2 +- src/main/scala/uk/gov/hmrc/play/config/GTMConfig.scala | 2 +- src/main/scala/uk/gov/hmrc/play/config/OptimizelyConfig.scala | 2 +- .../scala/uk/gov/hmrc/play/config/TrackingConsentConfig.scala | 2 +- src/main/scala/uk/gov/hmrc/play/mappers/DateTuple.scala | 2 +- src/main/scala/uk/gov/hmrc/play/mappers/StopOnFirstFail.scala | 2 +- src/main/scala/uk/gov/hmrc/play/validators/Validators.scala | 2 +- src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala | 2 +- src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala | 2 +- src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala | 2 +- .../twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala | 2 +- .../twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html | 2 +- .../gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html | 2 +- .../play/views/helpers/DateFieldsFreeInlineLegend.scala.html | 2 +- .../gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html | 2 +- .../hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html | 2 +- .../uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html | 2 +- .../gov/hmrc/play/views/helpers/ErrorNotifications.scala.html | 2 +- .../uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html | 2 +- .../uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html | 2 +- src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html | 2 +- .../uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html | 2 +- .../uk/gov/hmrc/play/views/helpers/RenderableMessage.scala | 2 +- .../gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html | 2 +- .../uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html | 2 +- src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html | 2 +- .../uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html | 2 +- src/main/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html | 2 +- src/main/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html | 2 +- .../hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html | 2 +- .../uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html | 2 +- .../twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html | 2 +- .../hmrc/play/views/layouts/TrackingConsentSnippet.scala.html | 2 +- src/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala | 2 +- src/test/scala/uk/gov/hmrc/play/MessagesSupport.scala | 2 +- src/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala | 2 +- src/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala | 2 +- src/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala | 2 +- src/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala | 2 +- .../play/views/config/AccessibilityStatementConfigSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala | 2 +- .../gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala | 2 +- src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala | 2 +- .../uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala | 2 +- src/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala | 2 +- .../hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala | 2 +- .../uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala | 2 +- src/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala | 2 +- src/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala | 2 +- .../hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala | 2 +- .../hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala | 2 +- .../scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala | 2 +- src/test/scala/uk/gov/hmrc/play/views/package.scala | 2 +- 91 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index f7625825..d0f326d5 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -1,4 +1,4 @@ -# Copyright 2023 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 index 548eb6f7..7c5f2dca 100644 --- 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 2023 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 index 29f75a93..33605688 100644 --- 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 2023 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 index f113ca41..f95ed30e 100644 --- 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 2023 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 index 9e3a4236..ef9b5e7b 100644 --- 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 2023 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 index 94568af2..6e748aa6 100644 --- 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 2023 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 index 2e9627d7..26396954 100644 --- 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 2023 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 index b792f41f..2d8169ef 100644 --- 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 2023 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 index 299b06ae..9feb2d1d 100644 --- 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 2023 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 index e784d8b7..8d2125c0 100644 --- 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 2023 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 index 4258edaf..4638c8bf 100644 --- 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 2023 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 index 9e1bb41b..e08fc01d 100644 --- 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 2023 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/DateTuple.scala b/src/main/scala/uk/gov/hmrc/play/mappers/DateTuple.scala index 6679b164..a87d8417 100644 --- 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 2023 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 index a68b9379..e95bb9a5 100644 --- 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 2023 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 index eb7fbe34..c1d8439f 100644 --- 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 2023 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/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala index a20021ae..b68010a1 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/formatting/Money.scala b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala index ec794df2..d89a6cb7 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala index 669ce950..0d323b5c 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html index 1da09a84..3af9734a 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala b/src/main/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala index 4830f1fa..031b9aaf 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html index 3654128f..35150d20 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html index 0503311a..361ecf39 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html index f8f47320..e1d58757 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html index 4cd13129..985fa6d0 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html index 237d7dd8..20603e1d 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html index 7f5f7c01..787a1793 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html index ac1b0c2e..1186d948 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html index 545ca7a4..71d4fcd5 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html index bed92491..8e9ca910 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html index ef4c4e5c..1022040c 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html index 2c4fe7db..151394da 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html index 5e95432d..e531144b 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html index cbd91539..72eefe6e 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html index 472056e9..afd302d1 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala b/src/main/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala index a5bd505c..cb9b3ffa 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html index 873f8edc..e4f11ffb 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html index 16109667..4e65a75d 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html index 9a5591f5..e32663cb 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/helpers/model.scala b/src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala index ad43a447..3e2dc223 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala +++ b/src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html index 90f58d9f..5536c674 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html index a3480122..e59b3f12 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html index 1fe3737e..6003ae0a 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/BetaBanner.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html index 4a15091f..1d1e00fd 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/EuExitLinks.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html index 67294259..0bb76a09 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Footer.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html index 3ab4cace..5fdbee05 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/FooterLinks.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html index f04c3b15..1419fce9 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/GTMSnippet.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html index 44a8f736..4f86a836 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Head.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html index 757f205a..de2176c1 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsent.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html index f00fe2e8..512a9709 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/HeaderNav.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html index a59643fc..50f91d5c 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/LoginStatus.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html index b321b359..3768d120 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContent.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html index 6cfafeb1..8d79c760 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/MainContentHeader.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html index 25214200..0a2843e8 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/ServiceInfo.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html index 340dc67e..fdd4bba7 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/Sidebar.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html b/src/main/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html index 8d4741bb..1e25990d 100644 --- a/src/main/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html +++ b/src/main/twirl/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippet.scala.html @@ -1,5 +1,5 @@ @* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala b/src/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala index acfca9ca..53d0abd8 100644 --- a/src/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala +++ b/src/test/scala/uk/gov/hmrc/play/JsoupHelpers.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/MessagesSupport.scala b/src/test/scala/uk/gov/hmrc/play/MessagesSupport.scala index c320395a..9beefdc8 100644 --- a/src/test/scala/uk/gov/hmrc/play/MessagesSupport.scala +++ b/src/test/scala/uk/gov/hmrc/play/MessagesSupport.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala index fbe6e3d3..67c90fab 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/ContinueUrlSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala index 9b54ee8a..977f0483 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/NonBlankStringSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala index 04811619..fd6fe9be 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/OriginSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala index 7571aaac..a69c7d1c 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/PositiveIntegerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala b/src/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala index 7ddfbd2f..3c17afff 100644 --- a/src/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/binders/SimpleObjectBinderSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala b/src/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala index a9d318eb..d56508d1 100644 --- a/src/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/language/WelshMessagesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala b/src/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala index b0b45625..8af7b163 100644 --- a/src/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/mappers/DateTupleSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala b/src/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala index fae556cf..9b2e698e 100644 --- a/src/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/validators/ValidatorsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala index 9d0d42f2..9982e286 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/config/AccessibilityStatementConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala index bb244046..73352e55 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/config/GTMConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala index 9fe28f6a..25c82b55 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/config/TrackingConsentConfigSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala index 8ec12097..8dc44c92 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/formatting/DatesSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala index 221429e4..07ebfbd2 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/formatting/StringsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala index c6f3810b..a016e20c 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/CSRFSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala index 41a14c9a..d024e462 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/DateFieldsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala index 06e30977..e741362f 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/DropDownSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala index 46a6fc62..57ad6ba6 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/FormWithCSRFSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala index df855d5d..d755499c 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputRadioGroupSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala index 17c97a20..f64368fc 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/InputSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala index e1095c2e..615ce57a 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/MoneyPoundsSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala index a72a116e..42f163e0 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/RenderableMoneyMessageSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala index 8d6c0315..b4c318af 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/helpers/SingleCheckboxSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala index d6c424f5..598e21cc 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/BetaBannerSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala index 74b25799..740b050e 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/EuExitLinksSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala index 364bb73b..392f6cf8 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterLinksSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala index d2b7cf9f..f20d5d54 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/FooterSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala index 16d67d29..e68a99da 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/GTMSnippetSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala index 31450f7c..1bc32ed6 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala index d1ed6998..88c2cf50 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/HeadWithTrackingConsentSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala index faa67ef6..79f2f9e0 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/LoginStatusSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala index 407e2f48..bd9b2ab5 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/ServiceInfoSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala index 8a905e2d..35a887f8 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/TrackingConsentSnippetSpec.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala b/src/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala index 30173d35..42de0fe8 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/layouts/test/TestConfigs.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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/test/scala/uk/gov/hmrc/play/views/package.scala b/src/test/scala/uk/gov/hmrc/play/views/package.scala index 1a2d10b9..1debdebb 100644 --- a/src/test/scala/uk/gov/hmrc/play/views/package.scala +++ b/src/test/scala/uk/gov/hmrc/play/views/package.scala @@ -1,5 +1,5 @@ /* - * Copyright 2023 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.