From ad158ca25764a1b28c03e7ca7912ce7be0df3893 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 30 Mar 2018 16:38:09 -0400
Subject: [PATCH] sbt 1.1.2

---
 .travis.yml                                   |  2 +-
 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    | 88 +++++++++++++++++++
 src/reference/template.properties             |  4 +-
 7 files changed, 103 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8df9f1615..9236297c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ addons:
       - sourceline: 'deb https://dl.bintray.com/sbt/debian /'
       - key_url: 'https://bintray.com/user/downloadSubjectPublicKey?username=sbt'
     packages:
-      - sbt=1.1.1
+      - sbt=1.1.2
       - pandoc
       - latex-cjk-all
       - texlive-full
diff --git a/project/Docs.scala b/project/Docs.scala
index e40deee6e..767cf9eee 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.1"
+  lazy val targetSbtFullVersion = "1.1.2"
 
   lazy val siteEmail = settingKey[String]("")
 
diff --git a/project/build.properties b/project/build.properties
index 31334bbd3..05313438a 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.1.2
diff --git a/src/nanoc/content/download.html b/src/nanoc/content/download.html
index 6c9b4f16a..fc40b8129 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.1
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.1.1/sbt-1.1.1.zip">.zip</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.1.1/sbt-1.1.1.tgz">.tgz</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.1.1/sbt-1.1.1.msi">.msi</a>)
+</li>
+
 <li>
   sbt 1.1.0
   (<a href="https://github.com/sbt/sbt/releases/download/v1.1.0/sbt-1.1.0.zip">.zip</a>)
diff --git a/src/nanoc/nanoc.yaml b/src/nanoc/nanoc.yaml
index 376e7dbd7..55c95ac91 100644
--- a/src/nanoc/nanoc.yaml
+++ b/src/nanoc/nanoc.yaml
@@ -1,8 +1,8 @@
-sbtVersion: 1.1.1
+sbtVersion: 1.1.2
 # Windows build version tends to be different from the rest
-windowsBuild: 1.1.1
+windowsBuild: 1.1.2
 
-sbtVersionForScalaDoc: 1.1.1
+sbtVersionForScalaDoc: 1.1.2
 
 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 3d3a1c219..ff8b7dc27 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,94 @@
 out: sbt-1.0-Release-Notes.html
 ---
 
+## sbt 1.1.2
+
+### Bug fixes
+
+- Fixes triggered execution's resource leak by caching the watch service. [#3999][3999] by [@eatkins][@eatkins]
+- Fixes classloader inheriting the dependencies of Scala compiler during `run` [zinc#505][zinc505] by [@eed3si9n][@eed3si9n]
+- Fixes forked test concurrency issue. [#4030][4030] by [@eatkins][@eatkins]
+- Fixes `new` command leaving behind target directory [#4033][4033] by [@eed3si9n][@eed3si9n]
+- Fixes handling on null Content-Type. [lm214][lm214] by [@staale][@staale]
+- Fixes null handling of `managedChecksums` in `ivySettings` file. [lm#218][lm218] by [@IanGabes][@IanGabes]
+- Adds `sbt.boot.lock` as a JVM property to opt-out of locking. [#3927][3927] by [@dwijnand][@dwijnand]
+- Provides `SBT_GLOBAL_SERVER_DIR` env var as a workaround to long socket file path on UNIX. [#3932][3932] by [@dwijnand][@dwijnand]
+- Fixes forked runs reporting noisy "Stream closed" exception. [#3970][3970] by [@retronym][@retronym]
+- Fixes test compilation not getting included in VS Code save trigger. [#4022][4022] by [@tmiyamon][@tmiyamon]
+- Fixes sbt server responding with string id when number id passed. [#4025][4025] by [@tiqwab][@tiqwab]
+- Fixes `getDecoder` in Analysis format [zinc#502][zinc502] by [@jilen][@jilen]
+- Fixes equal / hashCode inconsistencies around Array. [zinc#513][zinc513] by [@eed3si9n][@eed3si9n]
+- Whitelists `java9-rt-ext-output` in rt export process [lp#211][lp211] by [@eatkins][@eatkins]
+- Fixes JDK version detection for Java 10 friendliness. [lp#219][lp219] by [@eed3si9n][@eed3si9n] and [@2m][@2m]
+- Fixes quoting in Windows bat file. [lp#220][lp220] by [@ForNeVeR][@ForNeVeR]
+- Fixes `-error` not suppressing startup logs. [#4036][4036] by [@eed3si9n][@eed3si9n]
+
+### Improvements
+
+- Performance optimization around logging. [util#152][util152] by [@retronym][@retronym]
+- Performance fix by caching the hashCode of `Configuration`. [lm#213][lm213] by [@retronym][@retronym]
+- Returns error code `-33000L` on sbt server when a command fails. [#3991][3991] by [@dwijnand][@dwijnand]
+- Allows wildcards in organization and artifact. [#215][lm215] by [@dhs3000][@dhs3000]
+- Updates to latest Jsch to support stronger key exchange algorithms. [lm#217][lm217] by [@ryandbair][@ryandbair]
+- Fixes preloading of compiler bridge. [lp#222][lp222] by [@analytically][@analytically]
+
+### Internal
+
+- Updates [contribution guide][CONTRIBUTING]. [#3960][3960]/[#4019][4019] by [@eed3si9n][@eed3si9n] and [@itohiro73][@itohiro73]
+- Deletes `buildinfo.BuildInfo` from sbt main that was intended for testing. [3967][3967] by [@dwijnand][@dwijnand] and [@xuwei-k][@xuwei-k]
+- Various improvements around Zinc benchmark by [@retronym][@retronym]
+
+### Contributors
+
+sbt 1.1.2 was brought to you by 23 contributors, according to `git shortlog -sn --no-merges v1.1.1...v1.1.2` on sbt, zinc, librarymanagement, util, io, launcher-packege, and website: Dale Wijnand, Eugene Yokota, Jason Zaugg, Kenji Yoshida (xuwei-k), Ethan Atkins, Martijn Hoekstra, Martynas Mickevičius, Dennis Hörsch, Hosam Aly, Antonio Cunei, Friedrich von Never, Hiroshi Ito, Ian Gabes, Jilen Zhang, Mathias Bogaert, Naohisa Murakami (tiqwab), Philippus Baalman, Ryan Bair, Seth Tisue, Ståle Undheim, Takuya Miyamoto (tmiyamon), Yasuhiro Tatsuno. 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
+  [@xuwei-k]: https://github.com/xuwei-k
+  [@retronym]: https://github.com/retronym
+  [@eatkins]: https://github.com/eatkins
+  [@itohiro73]: https://github.com/itohiro73
+  [@tmiyamon]: https://github.com/tmiyamon
+  [@tiqwab]: https://github.com/tiqwab
+  [@staale]: https://github.com/staale
+  [@ryandbair]: https://github.com/ryandbair
+  [@dhs3000]: https://github.com/dhs3000
+  [@IanGabes]: https://github.com/IanGabes
+  [@jilen]: https://github.com/jilen
+  [@2m]: https://github.com/2m
+  [@ForNeVeR]: https://github.com/ForNeVeR
+  [@analytically]: https://github.com/analytically
+  [3927]: https://github.com/sbt/sbt/pull/3927
+  [3932]: https://github.com/sbt/sbt/pull/3932
+  [3960]: https://github.com/sbt/sbt/pull/3960
+  [3967]: https://github.com/sbt/sbt/pull/3967
+  [3970]: https://github.com/sbt/sbt/pull/3970
+  [3999]: https://github.com/sbt/sbt/pull/3999
+  [3991]: https://github.com/sbt/sbt/pull/3991
+  [4019]: https://github.com/sbt/sbt/pull/4019
+  [4022]: https://github.com/sbt/sbt/pull/4022
+  [4025]: https://github.com/sbt/sbt/pull/4025
+  [4030]: https://github.com/sbt/sbt/pull/4030
+  [4033]: https://github.com/sbt/sbt/pull/4033
+  [4036]: https://github.com/sbt/sbt/pull/4036
+  [util152]: https://github.com/sbt/util/pull/152
+  [lm213]: https://github.com/sbt/librarymanagement/pull/213
+  [lm214]: https://github.com/sbt/librarymanagement/pull/214
+  [lm215]: https://github.com/sbt/librarymanagement/pull/215
+  [lm217]: https://github.com/sbt/librarymanagement/pull/217
+  [lm218]: https://github.com/sbt/librarymanagement/pull/218
+  [zinc502]: https://github.com/sbt/zinc/pull/502
+  [zinc505]: https://github.com/sbt/zinc/pull/505
+  [zinc513]: https://github.com/sbt/zinc/pull/513
+  [lp211]: https://github.com/sbt/sbt-launcher-package/pull/211
+  [lp219]: https://github.com/sbt/sbt-launcher-package/pull/219
+  [lp220]: https://github.com/sbt/sbt-launcher-package/pull/220
+  [lp222]: https://github.com/sbt/sbt-launcher-package/pull/222
+  [CONTRIBUTING]: https://github.com/sbt/sbt/blob/1.x/CONTRIBUTING.md
+
 ## sbt 1.1.1
 
 ### Bug fixes
diff --git a/src/reference/template.properties b/src/reference/template.properties
index 3d852e992..ced0c20c7 100644
--- a/src/reference/template.properties
+++ b/src/reference/template.properties
@@ -1,5 +1,5 @@
-app_version=1.1.1
-windows_app_version=1.1.1
+app_version=1.1.2
+windows_app_version=1.1.2
 
 color_scheme=github
 example_scala_version=2.12.4