Merge pull request #709 from eed3si9n/wip/1.2.0

sbt 1.2.0
sbt · Jul 31, 2018 · 3abba0e · 3abba0e
2 parents 5be5c4c + f23504a
commit 3abba0e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 14 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-sbt.version=1.1.6
+sbt.version=1.2.0
diff --git 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
@@ -62,6 +62,13 @@ <h3>Previous releases</h3>
 <h4>1.x</h4>
 <ul>
 
+<li>
+  sbt 1.2.0
+  (<a href="https://piccolo.link/sbt-1.2.0.zip">.zip</a>)
+  (<a href="https://piccolo.link/sbt-1.2.0.tgz">.tgz</a>)
+  (<a href="https://piccolo.link/sbt-1.2.0.msi">.msi</a>)
+</li>
+
 <li>
   sbt 1.1.6
   (<a href="https://piccolo.link/sbt-1.1.6.zip">.zip</a>)

diff --git a/src/nanoc/nanoc.yaml b/src/nanoc/nanoc.yaml
@@ -1,8 +1,8 @@
-sbtVersion: 1.1.6
+sbtVersion: 1.2.0
 # Windows build version tends to be different from the rest
-windowsBuild: 1.1.6
+windowsBuild: 1.2.0
 
-sbtVersionForScalaDoc: 1.1.6
+sbtVersionForScalaDoc: 1.2.0
 
 sbtBinaryVersion: 1.0
 

diff --git a/src/reference/template.properties b/src/reference/template.properties
@@ -1,5 +1,5 @@
-app_version=1.1.6
-windows_app_version=1.1.6
+app_version=1.2.0
+windows_app_version=1.2.0
 
 color_scheme=github
 example_scala_version=2.12.6