Skip to content

Commit 37eec14

Browse files
authored
Merge pull request #8613 from sjrd/sbt-1.3.8
Upgrade to sbt 1.3.8 from 1.3.6.
2 parents 68e2023 + 607840b commit 37eec14

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ final case class SbtCommunityProject(
106106
case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
107107
case _ => Nil
108108
extraSbtArgs ++ sbtProps ++ List(
109-
"-sbt-version", "1.3.6",
109+
"-sbt-version", "1.3.8",
110110
s"--addPluginSbtFile=$sbtPluginFilePath")
111111

112112
object projects:

project/Build.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,7 @@ object Build {
196196
state
197197
},
198198

199-
// Turn off the sbt supershell because it can mangle the output of some tasks
200-
// (see https://github.com/sbt/sbt/issues/5122, https://github.com/sbt/sbt/issues/5352)
201-
// and in general I find it more distracting than helpful anyway.
199+
// I find supershell more distracting than helpful
202200
useSuperShell := false,
203201

204202
// Credentials to release to Sonatype

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.3.6
1+
sbt.version=1.3.8

0 commit comments

Comments
 (0)