Skip to content

Commit 39ed45a

Browse files
committed
Upgrade to latest sbt nightly
1 parent 9305b39 commit 39ed45a

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

project/Build.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,12 +1201,9 @@ object Build {
12011201
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config",
12021202
sbtTestDirectory := baseDirectory.value / "sbt-test",
12031203

1204-
// ensure that sbt-dotty is built on sbt 1.4
1204+
// ensure that sbt-dotty is built on sbt 1.4 and scripted are run on sbt 1.5
12051205
pluginCrossBuild / sbtVersion := "1.4.9",
1206-
1207-
// hack to run the scripted tests on sbt 1.5.0-bin-20210302T081602
1208-
// https://github.com/sbt/sbt/issues/6347
1209-
scriptedLaunchOpts ++= Seq("-Dsbt.version=1.5.0-bin-20210302T081602"),
1206+
scriptedSbt := "1.5.0-RC2",
12101207

12111208
// The batch mode accidentally became the default with no way to disable
12121209
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
@@ -1306,7 +1303,7 @@ object Build {
13061303
// hack to run the scripted tests on a nightly version of sbt
13071304
// see https://github.com/sbt/sbt/issues/6347
13081305
scriptedSbt := "1.4.7",
1309-
scriptedLaunchOpts ++= Seq("-Dsbt.version=1.5.0-bin-20210302T081602"),
1306+
scriptedLaunchOpts ++= Seq("-Dsbt.version=1.5.0-RC2"),
13101307

13111308
scriptedLaunchOpts ++= Seq(
13121309
"-Dplugin.version=" + version.value,

0 commit comments

Comments
 (0)