File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -1201,12 +1201,9 @@ object Build {
1201
1201
baseDirectory.value / " ../language-server/src/dotty/tools/languageserver/config" ,
1202
1202
sbtTestDirectory := baseDirectory.value / " sbt-test" ,
1203
1203
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
1205
1205
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" ,
1210
1207
1211
1208
// The batch mode accidentally became the default with no way to disable
1212
1209
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
@@ -1306,7 +1303,7 @@ object Build {
1306
1303
// hack to run the scripted tests on a nightly version of sbt
1307
1304
// see https://github.com/sbt/sbt/issues/6347
1308
1305
scriptedSbt := " 1.4.7" ,
1309
- scriptedLaunchOpts ++= Seq (" -Dsbt.version=1.5.0-bin-20210302T081602 " ),
1306
+ scriptedLaunchOpts ++= Seq (" -Dsbt.version=1.5.0-RC2 " ),
1310
1307
1311
1308
scriptedLaunchOpts ++= Seq (
1312
1309
" -Dplugin.version=" + version.value,
You can’t perform that action at this time.
0 commit comments