Merge pull request #680 from tanishiking/scala_version_2.12.6

Update scala version to 2.12.6, sbt 1.1.5
sbt · May 25, 2018 · 9813c73 · 9813c73
2 parents 30b6694 + 2487b63
commit 9813c73
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/reference/02-DetailTopics/01-Using-sbt/03-Cross-Build.md b/src/reference/02-DetailTopics/01-Using-sbt/03-Cross-Build.md
@@ -92,7 +92,7 @@ Scala. See [Publishing][Publishing] for more details on publishing your project.
 
 In order to make this process as quick as possible, different output and
 managed dependency directories are used for different versions of Scala.
-For example, when building against Scala 2.12.4,
+For example, when building against Scala 2.12.6,
 
 -   `./target/` becomes `./target/scala_2.12/`
 -   `./lib_managed/` becomes `./lib_managed/scala_2.12/`

diff --git a/src/reference/04-Howto/04-Howto-Inspect-the-Build.md b/src/reference/04-Howto/04-Howto-Inspect-the-Build.md
@@ -121,7 +121,7 @@ task and the value of a setting. For example:
 
 ```
 > inspect scalaVersion
-[info] Setting: java.lang.String = 2.12.4
+[info] Setting: java.lang.String = 2.12.6
 [info] Description:
 [info]  The version of Scala used for building.
 ...
@@ -192,11 +192,11 @@ details, see `help session`.
 
 ```
 > about
-[info] This is sbt 1.1.0
+[info] This is sbt 1.1.5
 [info] The current project is {file:~/code/sbt.github.com/}default
-[info] The current project is built against Scala 2.12.4
+[info] The current project is built against Scala 2.12.6
 [info] Available Plugins: sbt.plugins.IvyPlugin, sbt.plugins.JvmPlugin, sbt.plugins.CorePlugin, sbt.plugins.JUnitXmlReportPlugin, sbt.plugins.Giter8TemplatePlugin
-[info] sbt, sbt plugins, and build definitions are using Scala 2.12.4
+[info] sbt, sbt plugins, and build definitions are using Scala 2.12.6
 ```
 
 <a name="value"></a>
@@ -225,7 +225,7 @@ The `show` command also works for tasks, described next.
 [info]  Resolve time: 122 ms, Download time: 5 ms, Download size: 0 bytes
 [info]  compile:
 [info]      org.scala-lang:scala-library:
-[info]              - 2.12.4
+[info]              - 2.12.6
 [info] ...
 ```
 
@@ -238,7 +238,7 @@ value.
 ```
 > show compile:dependencyClasspath
 ...
-[info] ArrayBuffer(Attributed(/Users/foo/.sbt/boot/scala-2.12.4/lib/scala-library.jar))
+[info] ArrayBuffer(Attributed(/Users/foo/.sbt/boot/scala-2.12.6/lib/scala-library.jar))
 ```
 
 <a name="classpath"></a>
@@ -250,7 +250,7 @@ For the test classpath,
 ```
 > show test:dependencyClasspath
 ...
-[info] List(Attributed(/Users/foo/code/sbt.github.com/target/scala-2.12/classes), Attributed(~/.sbt/boot/scala-2.12.4/lib/scala-library.jar), Attributed(/Users/foo/.ivy2/cache/junit/junit/jars/junit-4.8.2.jar))
+[info] List(Attributed(/Users/foo/code/sbt.github.com/target/scala-2.12/classes), Attributed(~/.sbt/boot/scala-2.12.6/lib/scala-library.jar), Attributed(/Users/foo/.ivy2/cache/junit/junit/jars/junit-4.8.2.jar))
 ...
 ```
 

diff --git a/src/reference/04-Howto/14-How-Startup.md b/src/reference/04-Howto/14-How-Startup.md
@@ -21,7 +21,7 @@ lazy val startupTransition: State => State = { s: State =>
 
 lazy val root = (project in file("."))
   .settings(
-    scalaVersion in ThisBuild := "2.12.3",
+    scalaVersion in ThisBuild := "2.12.6",
     organization in ThisBuild := "com.example",
     name := "helloworld",
     dependencyUpdates := { println("hi") },

diff --git a/src/reference/template.properties b/src/reference/template.properties
@@ -7,7 +7,7 @@ example_scalacheck_version=1.13.4
 example_specs2_version=2.4.17
 example_scalatest_version=3.0.5
 scala_binary_version=2.12
-scala_version=2.12.4
+scala_version=2.12.6
 global_base=~/.sbt/1.0
 global_plugins_base=~/.sbt/1.0/plugins/
 global_plugin_sbt_file=~/.sbt/1.0/plugins/build.sbt

diff --git a/src/sbt-test/ref/basic/build.sbt b/src/sbt-test/ref/basic/build.sbt
@@ -1,5 +1,5 @@
 lazy val root = (project in file("."))
   .settings(
     name := "Hello",
-    scalaVersion := "2.12.3"
-  )
+    scalaVersion := "2.12.6"
+  )