Skip to content

Draft - update dependencies #777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
machinesleet wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Draft - update dependencies #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a34eba
DEP-3452 updates dependencies, webdriver-factory 0.35.0 causing class…
machinesleet Jul 21, 2022
6ba81bc
Merge branch 'main' into DEP-3452
machinesleet Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ import uk.gov.hmrc.DefaultBuildSettings.addTestReportOption

val appName = "accessibility-statement-frontend"

val silencerVersion = "1.7.0"
val silencerVersion = "1.7.9"

lazy val unitTestSettings =
inConfig(Test)(Defaults.testTasks) ++
Seq(
testOptions in Test := Seq(Tests.Filter(_ startsWith "unit")),
Test / testOptions := Seq(Tests.Filter(_ startsWith "unit")),
addTestReportOption(Test, "test-reports")
)

lazy val IntegrationTest = config("it") extend Test
lazy val integrationTestSettings =
inConfig(IntegrationTest)(Defaults.testTasks) ++
Seq(
(testOptions in IntegrationTest) := Seq(Tests.Filter(_ startsWith "it")),
(IntegrationTest / testOptions) := Seq(Tests.Filter(_ startsWith "it")),
addTestReportOption(IntegrationTest, "it-test-reports")
)

Expand All @@ -27,8 +27,8 @@ lazy val acceptanceTestSettings =
inConfig(AcceptanceTest)(Defaults.testTasks) ++
Seq(
// The following is needed to preserve the -Dbrowser option to the HMRC webdriver factory library
fork in AcceptanceTest := false,
(testOptions in AcceptanceTest) := Seq(Tests.Filter(_ startsWith "acceptance")),
AcceptanceTest / fork := false,
(AcceptanceTest / testOptions) := Seq(Tests.Filter(_ startsWith "acceptance")),
addTestReportOption(AcceptanceTest, "acceptance-test-reports")
)

Expand All @@ -38,7 +38,7 @@ lazy val microservice = Project(appName, file("."))
.configs(AcceptanceTest, IntegrationTest)
.settings(
majorVersion := 0,
scalaVersion := "2.12.11",
scalaVersion := "2.12.15",
playDefaultPort := 12346,
libraryDependencies ++= AppDependencies.compile ++ AppDependencies.test,
Compile / unmanagedResourceDirectories += baseDirectory.value / "testOnlyConf",
Expand All @@ -58,7 +58,7 @@ lazy val microservice = Project(appName, file("."))
"com.github.ghik" % "silencer-lib" % silencerVersion % Provided cross CrossVersion.full
),
// ***************
pipelineStages in Assets := Seq(gzip),
Assets / pipelineStages := Seq(gzip),
unitTestSettings,
acceptanceTestSettings,
integrationTestSettings,
Expand Down
12 changes: 5 additions & 7 deletions project/AppDependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,20 @@ object AppDependencies {
private val circeVersion = "0.12.0"

val compile = Seq(
"uk.gov.hmrc" %% "bootstrap-frontend-play-28" % "5.16.0",
"uk.gov.hmrc" %% "play-frontend-hmrc" % "3.17.0-play-28",
"uk.gov.hmrc" %% "bootstrap-frontend-play-28" % "6.3.0",
"uk.gov.hmrc" %% "play-frontend-hmrc" % "3.22.0-play-28",
"io.circe" %% "circe-core" % circeVersion,
"io.circe" %% "circe-generic" % circeVersion,
"io.circe" %% "circe-parser" % circeVersion,
"io.circe" %% "circe-yaml" % circeVersion
)

val test = Seq(
"uk.gov.hmrc" %% "bootstrap-test-play-28" % "5.16.0" % "test",
"org.scalatest" %% "scalatest" % "3.2.3" % "test",
"org.scalatestplus" %% "selenium-3-141" % "3.2.0.0" % "test",
"uk.gov.hmrc" %% "bootstrap-test-play-28" % "6.3.0" % "test",
"org.scalatest" %% "scalatest" % "3.2.0" % "test",
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % "test",
"org.mockito" %% "mockito-scala-scalatest" % "1.14.8" % "test",
"org.jsoup" % "jsoup" % "1.10.2" % "test",
"uk.gov.hmrc" %% "webdriver-factory" % "0.23.0" % "test",
"com.vladsch.flexmark" % "flexmark-all" % "0.36.8" % "test"
"uk.gov.hmrc" %% "webdriver-factory" % "0.34.0" % "test"
)
}
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.13
sbt.version=1.5.8
6 changes: 4 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact

resolvers += Resolver.typesafeRepo("releases")

addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.5.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.7.0")

addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.1.0")

Expand All @@ -15,4 +15,6 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")

addSbtPlugin("uk.gov.hmrc" % "sbt-accessibility-linter" % "0.17.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-accessibility-linter" % "0.25.0")

addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")