From bf492d515525890a3a0f2836fa520785ef98fbd4 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 12 Feb 2018 17:08:33 -0500
Subject: [PATCH] sbt 1.1.1

---
 project/Docs.scala                            |  2 +-
 project/build.properties                      |  2 +-
 src/nanoc/content/download.html               |  7 +++
 src/nanoc/nanoc.yaml                          |  6 +--
 .../90-Changes/47-sbt-1.0-Release-Notes.md    | 52 +++++++++++++++++++
 .../01-Using-sbt/07-sbt-server.md             |  2 +-
 src/reference/template.properties             |  4 +-
 7 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/project/Docs.scala b/project/Docs.scala
index ff2a42605..e40deee6e 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.0"
+  lazy val targetSbtFullVersion = "1.1.1"
 
   lazy val siteEmail = settingKey[String]("")
 
diff --git a/project/build.properties b/project/build.properties
index 8b697bbb9..31334bbd3 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.0
+sbt.version=1.1.1
diff --git a/src/nanoc/content/download.html b/src/nanoc/content/download.html
index 4b78bc815..6c9b4f16a 100644
--- a/src/nanoc/content/download.html
+++ b/src/nanoc/content/download.html
@@ -61,6 +61,13 @@ <h3>Previous releases</h3>
 <h4>1.x</h4>
 <ul>
 
+<li>
+  sbt 1.1.0
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.1.0/sbt-1.1.0.zip">.zip</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.1.0/sbt-1.1.0.tgz">.tgz</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.1.0/sbt-1.1.0.msi">.msi</a>)
+</li>
+
 <li>
   sbt 1.0.4
   (<a href="https://github.com/sbt/sbt/releases/download/v1.0.4/sbt-1.0.4.zip">.zip</a>)
diff --git a/src/nanoc/nanoc.yaml b/src/nanoc/nanoc.yaml
index d5c384c2c..376e7dbd7 100644
--- a/src/nanoc/nanoc.yaml
+++ b/src/nanoc/nanoc.yaml
@@ -1,8 +1,8 @@
-sbtVersion: 1.1.0
+sbtVersion: 1.1.1
 # Windows build version tends to be different from the rest
-windowsBuild: 1.1.0.1
+windowsBuild: 1.1.1
 
-sbtVersionForScalaDoc: 1.1.0
+sbtVersionForScalaDoc: 1.1.1
 
 sbtBinaryVersion: 1.0
 
diff --git a/src/reference/01-General-Info/90-Changes/47-sbt-1.0-Release-Notes.md b/src/reference/01-General-Info/90-Changes/47-sbt-1.0-Release-Notes.md
index 69abf9757..3d3a1c219 100644
--- a/src/reference/01-General-Info/90-Changes/47-sbt-1.0-Release-Notes.md
+++ b/src/reference/01-General-Info/90-Changes/47-sbt-1.0-Release-Notes.md
@@ -2,6 +2,58 @@
 out: sbt-1.0-Release-Notes.html
 ---
 
+## sbt 1.1.1
+
+### Bug fixes
+
+- Fixes "Modified names for (class) is empty" error. [zinc#292][zinc292] / [zinc#484][zinc484] by [@jvican][@jvican] (Scala Center)
+- Fixes tab completion in `console` while running in batch mode as `sbt console`. [#3841][3841]/[#3876][3876] by [@eed3si9n][@eed3si9n]
+- Fixes file timestamp retrieval of missing files on Windows. [#3871][3871] / [io#120][io120] by [@cunei][@cunei]
+- Aligns the errors thrown by file timestamp implementations. Fixes [#3894][3894] / [io#121][io121] by [@j-keck][@j-keck]
+- Adds file timestamps native support for FreeBSD. [#3894][3894] / [io#124][io124] by [@cunei][@cunei]
+- Fixes JDK 10 version string parsing. [sbt/sbt-launcher-package#209][launcher209] by [@2m][@2m]
+
+### Improvements
+
+- Deprecates `Extracted#append` in favour of `appendWithSession` or `appendWithoutSession`.  [#3865][3865] by [@dwijnand][@dwijnand]
+- Adds a new global `Boolean` setting called `autoStartServer`. See below.
+- Upgrades Scala versions used for sbt cross building `^^`. [#3923][3923] by [@dwijnand][@dwijnand]
+- Many documentation maintenance changes by [@xuwei-k][@xuwei-k].
+
+### autoStartServer setting
+
+sbt 1.1.1 adds a new global `Boolean` setting called `autoStartServer`, which is set to `true` by default.
+When set to `true`, sbt shell will automatically start sbt server. Otherwise, it will not start the server until `startSever` command is issued. This could be used to opt out of server for security reasons.
+
+[#3922][3922] by [@swaldman][@swaldman]
+
+### Contributors
+
+sbt 1.1.1 was brought to you by 16 contributors, according to `git shortlog -sn --no-merges v1.1.0 ..v1.1.0` on sbt, zinc, librarymanagement, util, io, and website: Kenji Yoshida (xuwei-k), Eugene Yokota, Dale Wijnand, Antonio Cunei, Steve Waldman, Arnout Engelen, Deokhwan Kim, OlegYch, Robert Walker, Jorge Vicente Cantero (jvican), Claudio Bley, Eric Peters, Lena Brüder, Seiya Mizuno, Seth Tisue, j-keck. Thank you!
+
+  [@eed3si9n]: https://github.com/eed3si9n
+  [@dwijnand]: http://github.com/dwijnand
+  [@cunei]: https://github.com/cunei
+  [@jvican]: https://github.com/jvican
+  [@Duhemm]: https://github.com/Duhemm
+  [@j-keck]: https://github.com/j-keck
+  [@swaldman]: https://github.com/swaldman
+  [@xuwei-k]: https://github.com/xuwei-k
+  [@2m]: https://github.com/2m
+  [3871]: https://github.com/sbt/sbt/issues/3871
+  [io120]: https://github.com/sbt/io/pull/120
+  [3894]: https://github.com/sbt/sbt/issues/3894
+  [io121]: https://github.com/sbt/io/pull/121
+  [io124]: https://github.com/sbt/io/pull/124
+  [zinc292]: https://github.com/sbt/zinc/issues/292
+  [zinc484]: https://github.com/sbt/zinc/pull/484
+  [3865]: https://github.com/sbt/sbt/pull/3865
+  [3841]: https://github.com/sbt/sbt/issues/3841
+  [3876]: https://github.com/sbt/sbt/pull/3876
+  [3923]: https://github.com/sbt/sbt/pull/3923
+  [3922]: https://github.com/sbt/sbt/pull/3922
+  [launcher209]: https://github.com/sbt/sbt-launcher-package/pull/209
+
 ## sbt 1.1.0
 
 This is a feature release for sbt 1.0.x series.
diff --git a/src/reference/02-DetailTopics/01-Using-sbt/07-sbt-server.md b/src/reference/02-DetailTopics/01-Using-sbt/07-sbt-server.md
index 638bbcb83..ac4b08a39 100644
--- a/src/reference/02-DetailTopics/01-Using-sbt/07-sbt-server.md
+++ b/src/reference/02-DetailTopics/01-Using-sbt/07-sbt-server.md
@@ -184,7 +184,7 @@ Here's an example output (with JSON-RPC headers omitted):
 
 ### `textDocument/didSave` event
 
-As of sbt 1.1.0-M1, sbt will execute the `compile` task upon receiving a `textDocument/didSave` notification.
+As of sbt 1.1.0, sbt will execute the `compile` task upon receiving a `textDocument/didSave` notification.
 This behavior is subject to change.
 
 ### `sbt/exec` request
diff --git a/src/reference/template.properties b/src/reference/template.properties
index bf8ada37d..3d852e992 100644
--- a/src/reference/template.properties
+++ b/src/reference/template.properties
@@ -1,5 +1,5 @@
-app_version=1.1.0
-windows_app_version=1.1.0.1
+app_version=1.1.1
+windows_app_version=1.1.1
 
 color_scheme=github
 example_scala_version=2.12.4