luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade Scala 2.12.4 -> 2.12.6 

I have no specific user-visible benefit in mind other than fewer
JARs to download for people who are on current versions of things
This commit is contained in:
Seth Tisue 2018-04-27 19:07:08 +02:00 committed by Eugene Yokota
parent bf8df381f5
commit 4477a42b5a
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -200,7 +200,7 @@ $ sbt
### Clearing out boot and local cache ### Clearing out boot and local cache
When you run a locally built sbt, the JAR artifacts will be now cached under `$HOME/.sbt/boot/scala-2.12.4/org.scala-sbt/sbt/1.$MINOR.$PATCH-SNAPSHOT` directory. To clear this out run: `reboot dev` command from sbt's session of your test application. When you run a locally built sbt, the JAR artifacts will be now cached under `$HOME/.sbt/boot/scala-2.12.6/org.scala-sbt/sbt/1.$MINOR.$PATCH-SNAPSHOT` directory. To clear this out run: `reboot dev` command from sbt's session of your test application.
One drawback of `-SNAPSHOT` version is that it's slow to resolve as it tries to hit all the resolvers. You can workaround that by using a version name like `1.$MINOR.$PATCH-LOCAL1`. A non-SNAPSHOT artifacts will now be cached under `$HOME/.ivy/cache/` directory, so you need to clear that out using [sbt-dirty-money](https://github.com/sbt/sbt-dirty-money)'s `cleanCache` task. One drawback of `-SNAPSHOT` version is that it's slow to resolve as it tries to hit all the resolvers. You can workaround that by using a version name like `1.$MINOR.$PATCH-LOCAL1`. A non-SNAPSHOT artifacts will now be cached under `$HOME/.ivy/cache/` directory, so you need to clear that out using [sbt-dirty-money](https://github.com/sbt/sbt-dirty-money)'s `cleanCache` task.

2
main/src/main/scala/sbt/PluginCross.scala
View File

@ -93,7 +93,7 @@ private[sbt] object PluginCross {
VersionNumber(sv) match { VersionNumber(sv) match {
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2" case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7" case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.4" case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.6"
case _ => sys.error(s"Unsupported sbt binary version: $sv") case _ => sys.error(s"Unsupported sbt binary version: $sv")
} }
} }

2
project/Dependencies.scala
View File

@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies { object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too // WARNING: Please Scala update versions in PluginCross.scala too
val scala212 = "2.12.5" val scala212 = "2.12.6"
val baseScalaVersion = scala212 val baseScalaVersion = scala212
// sbt modules // sbt modules

2
project/plugins.sbt
View File

@ -1,4 +1,4 @@
scalaVersion := "2.12.4" scalaVersion := "2.12.6"
scalacOptions ++= Seq("-feature", "-language:postfixOps") scalacOptions ++= Seq("-feature", "-language:postfixOps")
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.6") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.6")

2
sbt/src/sbt-test/tests/fork-async/build.sbt
View File

@ -2,7 +2,7 @@ testFrameworks += new TestFramework("utest.runner.Framework")
lazy val root = (project in file(".")). lazy val root = (project in file(".")).
settings( settings(
scalaVersion := "2.12.4", scalaVersion := "2.12.6",
libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.4" % Test, libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.4" % Test,
fork in Test := true fork in Test := true
) )

4
sbt/src/test/scala/sbt/RunFromSourceMain.scala
View File

@ -14,8 +14,8 @@ import buildinfo.TestBuildInfo
import xsbti._ import xsbti._
object RunFromSourceMain { object RunFromSourceMain {
private val sbtVersion = "1.0.3" // "dev" private val sbtVersion = "1.1.0" // "dev"
private val scalaVersion = "2.12.4" private val scalaVersion = "2.12.6"
def fork(workingDirectory: File): Try[Unit] = { def fork(workingDirectory: File): Try[Unit] = {
val fo = ForkOptions() val fo = ForkOptions()