diff --git a/docs/project/build.properties b/docs/project/build.properties index 563a014d..746ef5a2 100644 --- a/docs/project/build.properties +++ b/docs/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.8.0-RC1 diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt index 49462a85..befa0bc6 100644 --- a/docs/project/plugins.sbt +++ b/docs/project/plugins.sbt @@ -1,9 +1,4 @@ -lazy val plugins = (project in file(".")) - .dependsOn(sbtTwirl) - .settings( - excludeDependencies += "com.typesafe.sbt" % "sbt-native-packager", // TODO: remove when Play switched to com.github.sbt - 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 - ) +lazy val plugins = (project in file(".")).dependsOn(sbtTwirl) lazy val sbtTwirl = ProjectRef(Path.fileProperty("user.dir").getParentFile, "plugin") @@ -12,4 +7,3 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true) addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.0-M2")) addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.8.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11") // TODO: remove when Play itself pulls in 1.9.11+ diff --git a/project/build.properties b/project/build.properties index 563a014d..746ef5a2 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.8.0-RC1 diff --git a/sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt b/sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt index a5ac4f10..8519640a 100644 --- a/sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt +++ b/sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt @@ -1,5 +1 @@ -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-twirl" % sys.props("project.version")) diff --git a/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt b/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt index 4e842e37..7fe9e249 100644 --- a/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt +++ b/sbt-twirl/src/sbt-test/twirl/scalajs-compile/project/plugins.sbt @@ -1,6 +1,2 @@ -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-twirl" % sys.props("project.version")) addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")