diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 563f58c..0034226 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -15,9 +15,9 @@ concurrency: jobs: tests: name: Tests - uses: playframework/.github/.github/workflows/cmd.yml@v2 + uses: playframework/.github/.github/workflows/cmd.yml@v3 with: - java: 11, 8 + java: 17, 11 cmd: sbt test g8Test finish: @@ -25,4 +25,4 @@ jobs: if: github.event_name == 'pull_request' needs: # Should be last - "tests" - uses: playframework/.github/.github/workflows/rtm.yml@v2 + uses: playframework/.github/.github/workflows/rtm.yml@v3 diff --git a/build.sbt b/build.sbt index 6c66810..b238fd6 100644 --- a/build.sbt +++ b/build.sbt @@ -3,5 +3,5 @@ lazy val root = (project in file(".")). Test / test := { val _ = (Test / g8Test).toTask("").value }, - scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-XX:MaxPermSize=256m", "-Xss2m", "-Dfile.encoding=UTF-8"), + scriptedLaunchOpts ++= List("-Xms1024m", "-Xmx1024m", "-XX:ReservedCodeCacheSize=128m", "-Xss2m", "-Dfile.encoding=UTF-8"), ).enablePlugins(ScriptedPlugin) diff --git a/project/plugins.sbt b/project/plugins.sbt index 43c6ee3..3fc1ec8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1,5 @@ -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.14.0") +lazy val plugins = (project in file(".")).settings( + scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021 +) + +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8" % "0.16.0") diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties index 79edc5b..817e8c4 100644 --- a/src/main/g8/default.properties +++ b/src/main/g8/default.properties @@ -4,5 +4,5 @@ organization=com.example verbatim=*.css *.js *.png logback.xml # We use `play-exceptions` artifact as undependend of Scala version # just to find the latest version of Play in Maven Central -play_version = maven(com.typesafe.play, play-exceptions, stable) +play_version = maven(com.typesafe.play, play-exceptions) scala_version = maven(org.scala-lang, scala-library, stable) diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index f25fb2a..a6face8 100644 --- a/src/main/g8/project/plugins.sbt +++ b/src/main/g8/project/plugins.sbt @@ -1,2 +1,6 @@ +lazy val plugins = (project in file(".")).settings( + scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021 +) + addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "$play_version$") -addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.13.1") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.16.0")