From 3210c2f45c273afdbddc4f81712a7e8cfd8e072c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 9 May 2018 12:50:02 -0400
Subject: [PATCH 1/2] sbt 1.1.5

---
 project/Docs.scala                | 2 +-
 project/build.properties          | 2 +-
 src/nanoc/content/download.html   | 7 +++++++
 src/nanoc/nanoc.yaml              | 4 ++--
 src/reference/template.properties | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/project/Docs.scala b/project/Docs.scala
index b618057a5..dcfa47710 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.4"
+  lazy val targetSbtFullVersion = "1.1.5"
 
   lazy val siteEmail = settingKey[String]("")
 
diff --git a/project/build.properties b/project/build.properties
index 64cf32f7f..7c8173781 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.1.4
+sbt.version=1.1.5
diff --git a/src/nanoc/content/download.html b/src/nanoc/content/download.html
index 65f3368e4..d1aa2c19a 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.4
+  (<a href="https://piccolo.link/sbt-1.1.4.zip">.zip</a>)
+  (<a href="https://piccolo.link/sbt-1.1.4.tgz">.tgz</a>)
+  (<a href="https://piccolo.link/sbt-1.1.4.msi">.msi</a>)
+</li>
+
 <li>
   sbt 1.1.2
   (<a href="https://piccolo.link/sbt-1.1.2.zip">.zip</a>)
diff --git a/src/nanoc/nanoc.yaml b/src/nanoc/nanoc.yaml
index 92a84ed12..5a39df284 100644
--- a/src/nanoc/nanoc.yaml
+++ b/src/nanoc/nanoc.yaml
@@ -1,6 +1,6 @@
-sbtVersion: 1.1.4
+sbtVersion: 1.1.5
 # Windows build version tends to be different from the rest
-windowsBuild: 1.1.4
+windowsBuild: 1.1.5
 
 sbtVersionForScalaDoc: 1.1.2
 
diff --git a/src/reference/template.properties b/src/reference/template.properties
index b36e1d9c7..4d1047287 100644
--- a/src/reference/template.properties
+++ b/src/reference/template.properties
@@ -1,5 +1,5 @@
-app_version=1.1.4
-windows_app_version=1.1.4
+app_version=1.1.5
+windows_app_version=1.1.5
 
 color_scheme=github
 example_scala_version=2.12.6

From 5e7e4705316d743529057cc4b21a397f2e32094c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 9 May 2018 13:04:56 -0400
Subject: [PATCH 2/2] more 1.1.5

---
 .travis.yml          | 2 +-
 src/nanoc/nanoc.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6644e9f0a..ef7a20b70 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.2
+      - sbt=1.1.5
       - pandoc
       - latex-cjk-all
       - texlive-full
diff --git a/src/nanoc/nanoc.yaml b/src/nanoc/nanoc.yaml
index 5a39df284..c7eb42270 100644
--- a/src/nanoc/nanoc.yaml
+++ b/src/nanoc/nanoc.yaml
@@ -2,7 +2,7 @@ sbtVersion: 1.1.5
 # Windows build version tends to be different from the rest
 windowsBuild: 1.1.5
 
-sbtVersionForScalaDoc: 1.1.2
+sbtVersionForScalaDoc: 1.1.5
 
 sbtBinaryVersion: 1.0