From b7eeec38efcc90a07aac304fdef42346cb648f5c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sun, 26 Nov 2017 15:09:39 -0500
Subject: [PATCH] sbt 1.0.4

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

diff --git a/project/Docs.scala b/project/Docs.scala
index f7de6eb58..aa54e40c4 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.0.3"
+  lazy val targetSbtFullVersion = "1.0.4"
   lazy val siteEmail = settingKey[String]("")
 
   val isGenerateSiteMap = settingKey[Boolean]("generates site map or not")
diff --git a/project/build.properties b/project/build.properties
index 9abea1294..394cb75cf 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.3
+sbt.version=1.0.4
diff --git a/src/nanoc/content/download.html b/src/nanoc/content/download.html
index 92e2a97b9..4e02bd5b9 100644
--- a/src/nanoc/content/download.html
+++ b/src/nanoc/content/download.html
@@ -61,6 +61,20 @@ <h3>Previous releases</h3>
 <h4>1.x</h4>
 <ul>
 
+<li>
+  sbt 1.0.3
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.0.3/sbt-1.0.3.zip">.zip</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.0.3/sbt-1.0.3.tgz">.tgz</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.0.3/sbt-1.0.3.msi">.msi</a>)
+</li>
+
+<li>
+  sbt 1.0.2
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.0.2/sbt-1.0.2.zip">.zip</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.0.2/sbt-1.0.2.tgz">.tgz</a>)
+  (<a href="https://github.com/sbt/sbt/releases/download/v1.0.2/sbt-1.0.2.msi">.msi</a>)
+</li>
+
 <li>
   sbt 1.0.1
   (<a href="https://github.com/sbt/sbt/releases/download/v1.0.1/sbt-1.0.1.zip">.zip</a>)
diff --git a/src/nanoc/nanoc.yaml b/src/nanoc/nanoc.yaml
index 601703b00..5049a56f2 100644
--- a/src/nanoc/nanoc.yaml
+++ b/src/nanoc/nanoc.yaml
@@ -1,9 +1,9 @@
-sbtVersion: 1.0.3
+sbtVersion: 1.0.4
 
 # Windows build version tends to be different from the rest
-windowsBuild: 1.0.3
+windowsBuild: 1.0.4
 
-sbtVersionForScalaDoc: 1.0.3
+sbtVersionForScalaDoc: 1.0.4
 
 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 68624684e..8555e3c6b 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,73 @@
 out: sbt-1.0-Release-Notes.html
 ---
 
+### sbt 1.0.4
+
+This is a hotfix release for sbt 1.0.x series.
+
+#### Bug fixes
+
+- Fixes undercompilation of value classes when the underlying type changes. [zinc#444][zinc444] by [@smarter][@smarter]
+- Fixes `ArrayIndexOutOfBoundsException` on Ivy when running on Java 9. [ivy#27][ivy27] by [@xuwei-k][@xuwei-k]
+- Fixes Java 9 warning by upgrading to launcher 1.0.2. [ivy#26][ivy26]/[launcher#45][launcher45] by [@dwijnand][@dwijnand]
+- Fixes `-jvm-debug` on Java 9. [launcher-package197][sbt-launcher-package197] by [@mkurz][@mkurz]
+- Fixes `run` outputing debug level logs. [#3655][3655]/[#3717][3717] by [@cunei][@cunei]
+- Fixes performance regression caused by classpath hashing. [zinc#452][zinc452] by [@jvican][@jvican], [@fommil][@fommil] provided reproduction, and [@eed3si9n][@eed3si9n] fixed https://github.com/sbt/zinc/issues/457
+- Fixes performance regression of `testQuick`. [#3680][3680]/[#3720][3720] by [@OlegYch][@OlegYch]
+- Disables Ivy log4j caller location calculation for performance regression reported in [#3711][3711]. [util#132][util132] by [@leonardehrenfried][@leonardehrenfried]
+- Works around Scala compiler's `templateStats()` not being thread-safe. [#3743][3743] by [@cunei][@cunei]
+- Fixes "Attempting to overwrite" error message. [lm#174][lm174] by [@dwijnand][@dwijnand]
+- Fixes incorrect eviction warning message. [lm#179][lm179] by [@xuwei-k][@xuwei-k]
+- Registers Ivy protocol only for `http:` and `https:` to be more plugin friendly. [lm183][lm183] by [@tpunder][@tpunder]
+- Fixes script issues related to `bc` by using `expr`. [launcher-package#199][sbt-launcher-package199] by [@thatfulvioguy][@thatfulvioguy]
+
+#### Enhancement
+
+- Adds Scala 2.13.0-M2 support. [zinc#453][zinc453] by [@eed3si9n][@eed3si9n] and [@jan0sch][@jan0sch]
+
+#### Internal
+
+- Improves Zinc scripted testing. [zinc#440][zinc440] by [@jvican][@jvican]
+
+#### Contributors
+
+A huge thank you to everyone who's helped improve sbt and Zinc 1 by using them, reporting bugs, improving our documentation, porting builds, porting plugins, and submitting and reviewing pull requests.
+
+This release was brought to you by 17 contributors, according to `git shortlog -sn --no-merges v1.0.3..v1.0.4` on sbt, zinc, librarymanagement, util, io, and website: Eugene Yokota, Kenji Yoshida (xuwei-k), Jorge Vicente Cantero (jvican), Dale Wijnand, Leonard Ehrenfried, Antonio Cunei, Brett Randall, Guillaume Martres, Arnout Engelen, Fulvio Valente, Jens Grassel, Matthias Kurz, OlegYch, Philippus Baalman, Sam Halliday, Tim Underwood, Tom Most. Thank you!
+
+  [@dwijnand]: https://github.com/dwijnand
+  [@cunei]: https://github.com/cunei
+  [@eed3si9n]: https://github.com/eed3si9n
+  [@jvican]: https://github.com/jvican
+  [@OlegYch]: https://github.com/OlegYch
+  [@leonardehrenfried]: https://github.com/leonardehrenfried
+  [@xuwei-k]: https://github.com/xuwei-k
+  [@tpunder]: https://github.com/tpunder
+  [@smarter]: https://github.com/smarter
+  [@jan0sch]: https://github.com/jan0sch
+  [@mkurz]: https://github.com/mkurz
+  [@thatfulvioguy]: https://github.com/thatfulvioguy
+  [@fommil]: https://github.com/fommil
+  [3655]: https://github.com/sbt/sbt/issues/3655
+  [3717]: https://github.com/sbt/sbt/pull/3717
+  [ivy26]: https://github.com/sbt/ivy/pull/26
+  [ivy27]: https://github.com/sbt/ivy/pull/27
+  [launcher45]: https://github.com/sbt/launcher/pull/45
+  [3680]: https://github.com/sbt/sbt/issues/3680
+  [3720]: https://github.com/sbt/sbt/pull/3720
+  [3743]: https://github.com/sbt/sbt/pull/3743
+  [3711]: https://github.com/sbt/sbt/issues/3711
+  [util132]: https://github.com/sbt/util/pull/132
+  [lm174]: https://github.com/sbt/librarymanagement/pull/174
+  [lm179]: https://github.com/sbt/librarymanagement/pull/179
+  [lm183]: https://github.com/sbt/librarymanagement/pull/183
+  [zinc452]: https://github.com/sbt/zinc/pull/452
+  [zinc444]: https://github.com/sbt/zinc/pull/444
+  [zinc453]: https://github.com/sbt/zinc/pull/453
+  [zinc440]: https://github.com/sbt/zinc/pull/440
+  [sbt-launcher-package197]: https://github.com/sbt/sbt-launcher-package/pull/197
+  [sbt-launcher-package199]: https://github.com/sbt/sbt-launcher-package/pull/199
+
 ### sbt 1.0.3
 
 This is a hotfix release for sbt 1.0.x series.
diff --git a/src/reference/template.properties b/src/reference/template.properties
index 97b67d035..2a1df3de1 100644
--- a/src/reference/template.properties
+++ b/src/reference/template.properties
@@ -1,13 +1,13 @@
-app_version=1.0.3
-windows_app_version=1.0.3
+app_version=1.0.4
+windows_app_version=1.0.4
 
 color_scheme=github
-example_scala_version=2.12.3
+example_scala_version=2.12.4
 example_scalacheck_version=1.13.4
 example_specs2_version=2.4.17
 example_scalatest_version=3.0.1
 scala_binary_version=2.12
-scala_version=2.12.3
+scala_version=2.12.4
 global_base=~/.sbt/1.0
 global_plugins_base=~/.sbt/1.0/plugins/
 global_plugin_sbt_file=~/.sbt/1.0/plugins/build.sbt