Merge pull request #714 from eed3si9n/wip/1.2.1

sbt 1.2.1
sbt · Aug 7, 2018 · 9e94e3f · 9e94e3f
2 parents b31bd01 + 9cb6539
commit 9e94e3f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ sudo: false
 
 language: ruby
 
-rvm: 2.2.3
+rvm: 2.4.4
 
 cache:
   - apt

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.2.0"
+  lazy val targetSbtFullVersion = "1.2.1"
 
   lazy val siteEmail = settingKey[String]("")
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.0
+sbt.version=1.2.1
diff --git a/src/nanoc/content/download.html b/src/nanoc/content/download.html
@@ -62,6 +62,13 @@ <h3>Previous releases</h3>
 <h4>1.x</h4>
 <ul>
 
+<li>
+  sbt 1.2.1
+  (<a href="https://piccolo.link/sbt-1.2.1.zip">.zip</a>)
+  (<a href="https://piccolo.link/sbt-1.2.1.tgz">.tgz</a>)
+  (<a href="https://piccolo.link/sbt-1.2.1.msi">.msi</a>)
+</li>
+
 <li>
   sbt 1.2.0
   (<a href="https://piccolo.link/sbt-1.2.0.zip">.zip</a>)

diff --git a/src/nanoc/nanoc.yaml b/src/nanoc/nanoc.yaml
@@ -1,8 +1,8 @@
-sbtVersion: 1.2.0
+sbtVersion: 1.2.1
 # Windows build version tends to be different from the rest
-windowsBuild: 1.2.0
+windowsBuild: 1.2.1
 
-sbtVersionForScalaDoc: 1.2.0
+sbtVersionForScalaDoc: 1.2.1
 
 sbtBinaryVersion: 1.0
 

diff --git a/src/reference/template.properties b/src/reference/template.properties
@@ -1,5 +1,5 @@
-app_version=1.2.0
-windows_app_version=1.2.0
+app_version=1.2.1
+windows_app_version=1.2.1
 
 color_scheme=github
 example_scala_version=2.12.6
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ sudo: false @@
     language: ruby
-    rvm: 2.2.3
+    rvm: 2.4.4
     cache:
       - apt
@@ Expand Down @@