Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ Once you've identified (or created) an [issue](https://github.com/hmrc/hmrc-fron
* Fork the repository
* Write tests along with your code
* Add logical, atomic commits with [good commit messages](#commit-messages)
* Raise your Pull Request against the `develop` branch using our [Pull Request template](.github/PULL_REQUEST_TEMPLATE.md)
* Raise your Pull Request against the `main` branch using our [Pull Request template](.github/PULL_REQUEST_TEMPLATE.md)
* We will review and offer any feedback
* Once merged to `develop`, we will coordinate a merge into `main` and a release
* We will coordinate a merge into `main` and a release

## Commits

Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
lazy val root = (project in file("."))
.enablePlugins(ScriptedPlugin)
.settings(

name := "hmrc-frontend-scaffold.g8",

ScriptedPlugin.scriptedSettings,
scriptedLaunchOpts := { scriptedLaunchOpts.value ++
scriptedLaunchOpts ++= { scriptedLaunchOpts.value ++
Seq("-Xmx1024M", "-XX:MaxPermSize=256M", "-Dplugin.version=" + version.value, s"-Dtemplate-path=${file(".").getAbsolutePath.dropRight(2)}")
},

// disable this to help with debugging tests
scriptedBufferLog := true,

test in Test := {
(scripted in Test).toTask("").value
Test / test := {
(Test / scripted).toTask("").value
}
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.16
sbt.version=1.10.10
2 changes: 1 addition & 1 deletion project/giter8.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.9.0")
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.18.0")
2 changes: 1 addition & 1 deletion project/scripted.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libraryDependencies += { "org.scala-sbt" % "scripted-plugin" % sbtVersion.value }
libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value }
4 changes: 2 additions & 2 deletions src/main/g8/project/AppDependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import sbt._

object AppDependencies {

private val bootstrapVersion = "10.1.0"
private val hmrcMongoVersion = "2.7.0"
private val bootstrapVersion = "10.3.0"
private val hmrcMongoVersion = "2.10.0"

val compile = Seq(
play.sbt.PlayImport.ws,
Expand Down
4 changes: 2 additions & 2 deletions src/main/g8/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.24.0")

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

addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.6")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.8")

addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0" exclude("org.scala-lang.modules", "scala-xml_2.12"))

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")

addSbtPlugin("uk.gov.hmrc" % "sbt-sass-compiler" % "0.11.0")
addSbtPlugin("uk.gov.hmrc" % "sbt-sass-compiler" % "0.12.0")

addSbtPlugin("com.github.sbt" % "sbt-concat" % "1.0.0")

Expand Down
2 changes: 1 addition & 1 deletion src/main/g8/project/scaffold.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.16.2")
addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.18.0")