Merge pull request #670 from eed3si9n/wip/1.1.5

sbt 1.1.5
sbt · May 9, 2018 · 2bbff25 · 2bbff25
2 parents 7235b4a + 5e7e470
commit 2bbff25
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -1,8 +1,8 @@
-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
+sbtVersionForScalaDoc: 1.1.5
 
 sbtBinaryVersion: 1.0
 

diff --git 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