From 607840b195dbd7ac2741636ff3e1656d2c5d2710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Wed, 25 Mar 2020 19:43:51 +0100 Subject: [PATCH] Upgrade to sbt 1.3.8 from 1.3.6. * https://github.com/sbt/sbt/issues/5352 was fixed in 1.3.7, hence the change in the comment about supershell. * https://github.com/sbt/sbt/issues/5224 was fixed in 1.3.8, which fixes the build on Windows. --- .../test/scala/dotty/communitybuild/CommunityBuildTest.scala | 2 +- project/Build.scala | 4 +--- project/build.properties | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 2d085ee6afdf..099d6ff8aedd 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -106,7 +106,7 @@ final case class SbtCommunityProject( case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome") case _ => Nil extraSbtArgs ++ sbtProps ++ List( - "-sbt-version", "1.3.6", + "-sbt-version", "1.3.8", s"--addPluginSbtFile=$sbtPluginFilePath") object projects: diff --git a/project/Build.scala b/project/Build.scala index fa4a423cac69..880dbd81c5cf 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -196,9 +196,7 @@ object Build { state }, - // Turn off the sbt supershell because it can mangle the output of some tasks - // (see https://github.com/sbt/sbt/issues/5122, https://github.com/sbt/sbt/issues/5352) - // and in general I find it more distracting than helpful anyway. + // I find supershell more distracting than helpful useSuperShell := false, // Credentials to release to Sonatype diff --git a/project/build.properties b/project/build.properties index 00b48d978b25..a919a9b5f46b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.6 +sbt.version=1.3.8