Skip to content

Commit 28b5f03

Browse files
committed
Workaround sbt/sbt#3469
1 parent 5c20e2e commit 28b5f03

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ project/local-plugins.sbt
1818
.history
1919
.ensime
2020
.ensime_cache/
21+
.sbt-scripted/
2122

2223
# npm
2324
node_modules

project/Build.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,11 +892,14 @@ object Build {
892892
sbtPlugin := true,
893893
version := "0.1.8",
894894
sbtTestDirectory := baseDirectory.value / "sbt-test",
895-
scriptedLaunchOpts += "-Dplugin.version=" + version.value,
896-
scriptedLaunchOpts += "-Dplugin.scalaVersion=" + dottyVersion,
895+
scriptedLaunchOpts ++= Seq(
896+
"-Dplugin.version=" + version.value,
897+
"-Dplugin.scalaVersion=" + dottyVersion,
898+
"-Dsbt.boot.directory=" + ((baseDirectory in ThisBuild).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
899+
),
897900
// By default scripted tests use $HOME/.ivy2 for the ivy cache. We need to override this value for the CI.
898901
scriptedLaunchOpts ++= ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList,
899-
scriptedBufferLog := false,
902+
scriptedBufferLog := true,
900903
scripted := scripted.dependsOn(Def.task {
901904
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
902905
val x1 = (publishLocal in `dotty-interfaces`).value

0 commit comments

Comments
 (0)