diff --git a/build.sbt b/build.sbt index 127c9b6f0..8942d4ee5 100644 --- a/build.sbt +++ b/build.sbt @@ -4,14 +4,12 @@ import Docs._ lazy val tutorialSubDirName = settingKey[String]("subdir name for old tutorial") lazy val fileEncoding = settingKey[String]("check the file encoding") +ThisBuild / organization := "org.scala-sbt" +ThisBuild / scalafmtOnCompile := true + lazy val root = (project in file(".")) - .enablePlugins(NanocPlugin, LowTechSnippetPamfletPlugin) + .enablePlugins(NanocPlugin, LowTechSnippetPamfletPlugin, ScriptedPlugin) .settings( - inThisBuild(Seq( - organization := "org.scala-sbt", - scalafmtOnCompile := true, - )), - name := "website", siteEmail := "eed3si9n" + "@gmail.com", // Reference diff --git a/project/Docs.scala b/project/Docs.scala index 872e23ce5..416e55573 100644 --- a/project/Docs.scala +++ b/project/Docs.scala @@ -20,7 +20,7 @@ object Docs { // - src/nanoc/nanoc.yaml // - src/reference/template.properties lazy val targetSbtBinaryVersion = "1.x" - lazy val targetSbtFullVersion = "1.1.6" + lazy val targetSbtFullVersion = "1.2.0" lazy val siteEmail = settingKey[String]("") diff --git a/project/build.properties b/project/build.properties index d6e35076c..f59579fd6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.6 +sbt.version=1.2.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index bfdf723dc..11680e942 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") libraryDependencies += "org.foundweekends" %% "pamflet-library" % "0.7.2" -libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15") diff --git a/src/nanoc/content/download.html b/src/nanoc/content/download.html index d951139bf..7c4d33cff 100644 --- a/src/nanoc/content/download.html +++ b/src/nanoc/content/download.html @@ -62,6 +62,13 @@