From 13a047dafe9d65fa17f8b131e94f35a260dd0372 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 19 Sep 2019 18:09:57 -0400 Subject: [PATCH 1/2] clear banner --- main/src/main/scala/sbt/Main.scala | 4 +++- main/src/main/scala/sbt/internal/Banner.scala | 24 +++++++++++-------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index 4e515baaa..16bf67ad1 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -977,7 +977,9 @@ object BuiltinCommands { val skipFile = skipWelcomeFile(state, version) Files.createDirectories(skipFile.getParent) val suppress = !SysProp.banner || Files.exists(skipFile) - if (!suppress) state.log.info(Banner(version)) + if (!suppress) { + Banner(version).foreach(banner => state.log.info(banner)) + } } catch { case _: IOException => /* Don't let errors in this command prevent startup */ } state.put(bannerHasBeenShown, true) } else state diff --git a/main/src/main/scala/sbt/internal/Banner.scala b/main/src/main/scala/sbt/internal/Banner.scala index 767903a83..b317b5c9e 100644 --- a/main/src/main/scala/sbt/internal/Banner.scala +++ b/main/src/main/scala/sbt/internal/Banner.scala @@ -8,14 +8,18 @@ package sbt.internal private[sbt] object Banner { - def apply(version: String): String = - s""" - |Welcome to sbt $version. - |Here are some highlights of this release: - | - Coursier: new default library management using https://get-coursier.io - | - Super shell: displays actively running tasks - | - Turbo mode: makes `test` and `run` faster in interactive sessions. Try it by running `set ThisBuild / turbo := true`. - |See https://www.lightbend.com/blog/sbt-1.3.0-release for full release notes. - |Hide the banner for this release by running `skipBanner`. - |""".stripMargin.linesIterator.filter(_.nonEmpty).mkString("\n") + def apply(version: String): Option[String] = + version match { + case "1.3.0" => + Some(s""" + |Welcome to sbt $version. + |Here are some highlights of this release: + | - Coursier: new default library management using https://get-coursier.io + | - Super shell: displays actively running tasks + | - Turbo mode: makes `test` and `run` faster in interactive sessions. Try it by running `set ThisBuild / turbo := true`. + |See https://www.lightbend.com/blog/sbt-1.3.0-release for full release notes. + |Hide the banner for this release by running `skipBanner`. + |""".stripMargin.linesIterator.filter(_.nonEmpty).mkString("\n")) + case _ => None + } } From 634a11ab4d6458b641a2aaa2b1325265c08a7f8c Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 19 Sep 2019 18:10:47 -0400 Subject: [PATCH 2/2] io 1.3.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e8ed09edb..ee6b95b7a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { def nightlyVersion: Option[String] = sys.props.get("sbt.build.version") // sbt modules - private val ioVersion = nightlyVersion.getOrElse("1.3.0") + private val ioVersion = nightlyVersion.getOrElse("1.3.1") private val utilVersion = nightlyVersion.getOrElse("1.3.0") private val lmVersion = sys.props.get("sbt.build.lm.version") match {