Skip to content

Commit 53124d2

Browse files
kyle-bowdenkyle-bowden
authored
Merge pull request #167 from hmrc/PLATUI-1736_cross_compile_scala
PLATUI-1736: Cross build for Scala 2.13
2 parents b2c6360 + 712dc02 commit 53124d2

File tree

100 files changed

+141
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+141
-110
lines changed

‎build.sbt

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import uk.gov.hmrc.playcrosscompilation.PlayVersion
22

3+
val scala2_12 = "2.12.15"
4+
val scala2_13 = "2.13.7"
5+
36
val appName = "play-ui"
4-
val silencerVersion = "1.4.4"
7+
val silencerVersion = "1.7.7"
58

69
lazy val root = Project(appName, file("."))
7-
.enablePlugins(SbtAutoBuildPlugin, SbtGitVersioning, SbtTwirl)
10+
.enablePlugins(SbtTwirl)
811
.disablePlugins(JUnitXmlReportPlugin) // Required to prevent https://github.com/scalatest/scalatest/issues/1427
912
.settings(
1013
majorVersion := 9,
11-
scalaVersion := "2.12.10",
12-
crossScalaVersions := List("2.12.10"),
13-
libraryDependencies ++= LibDependencies.libDependencies,
14-
resolvers :=
15-
Seq(
16-
"typesafe-releases" at "https://repo.typesafe.com/typesafe/releases/"
17-
)
14+
scalaVersion := scala2_12,
15+
crossScalaVersions := Seq(scala2_12, scala2_13),
16+
libraryDependencies ++= LibDependencies.libDependencies
1817
)
1918
.settings(
2019
TwirlKeys.templateImports := Seq(

‎docs/maintainers/0001-scala-cross-compilation.md

+32

‎project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# limitations under the License.
1515
#
1616

17-
sbt.version=1.4.6
17+
sbt.version=1.5.8

‎project/plugins.sbt

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ resolvers += MavenRepository("HMRC-open-artefacts-maven2", "https://open.artefac
22
resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefacts.tax.service.gov.uk/ivy2"))(
33
Resolver.ivyStylePatterns
44
)
5-
resolvers += Resolver.typesafeRepo("releases")
65

7-
addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.0.0")
6+
addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.6.0")
87

9-
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.3.15")
8+
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
109

11-
addSbtPlugin("uk.gov.hmrc" % "sbt-play-cross-compilation" % "2.2.0")
10+
addSbtPlugin("uk.gov.hmrc" % "sbt-play-cross-compilation" % "2.3.0")
1211

1312
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")

‎src/main/resources/reference.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021 HM Revenue & Customs
1+
# Copyright 2022 HM Revenue & Customs
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/binders/ContinueUrl.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/binders/NonBlankString.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/binders/Origin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/binders/PositiveInteger.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/binders/QueryBinders.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/binders/SimpleObjectBinder.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/config/AccessibilityStatementConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/config/AssetsConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/config/GTMConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/config/OptimizelyConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/config/TrackingConsentConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/deprecatedPlay26Helpers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/mappers/DateTuple.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/mappers/StopOnFirstFail.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/validators/Validators.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/views/html/helpers/deprecatedPlay26Helpers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/scala/uk/gov/hmrc/play/views/html/layouts/deprecatedPlay26Helpers.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/formatting/Dates.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/formatting/Money.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/formatting/Strings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/Address.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/AttorneyRegime.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFields.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInline.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeInlineLegend.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYear.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsFreeYearInline.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/DateFieldsInline.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/Dropdown.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorInline.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorNotifications.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/ErrorSummary.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/FieldGroup.scala.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
1515
*@
1616

1717
@import uk.gov.hmrc.play.views.helpers.FormField
18+
@import scala.language.postfixOps
1819

1920
@this(dateFieldsInline: DateFieldsInline, dropdown: Dropdown)
2021

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/FormWithCSRF.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/Input.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/InputRadioGroup.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/RenderableMessage.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/ReportAProblemLink.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/SingleCheckbox.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/TextArea.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/helpers/model.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/layouts/Article.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/twirl/uk/gov/hmrc/play/views/layouts/AttorneyBanner.scala.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@*
2-
* Copyright 2021 HM Revenue & Customs
2+
* Copyright 2022 HM Revenue & Customs
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)