File tree 4 files changed +6
-6
lines changed
4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -322,12 +322,9 @@ jobs:
322
322
- name : Add SBT proxy repositories
323
323
run : cp -vf .github/workflows/repositories /root/.sbt/ ; true
324
324
325
- - name : Test sbt 1.4.x
325
+ - name : Test sbt
326
326
run : ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
327
327
328
- - name : Test sbt 1.5.x
329
- run : ./project/scripts/sbt "set \`sbt-dotty\`/scriptedSbt := \"1.5.0-RC1\"; sbt-dotty/scripted sbt-dotty/*"
330
-
331
328
test_java8 :
332
329
runs-on : [self-hosted, Linux]
333
330
container :
Original file line number Diff line number Diff line change @@ -121,7 +121,7 @@ final case class SbtCommunityProject(
121
121
case Some (ivyHome) => List (s " -Dsbt.ivy.home= $ivyHome" )
122
122
case _ => Nil
123
123
extraSbtArgs ++ sbtProps ++ List (
124
- " -sbt-version" , " 1.4.9 " ,
124
+ " -sbt-version" , " 1.5.0-RC2 " ,
125
125
" -Dsbt.supershell=false" ,
126
126
s " -Ddotty.communitybuild.dir= $communitybuildDir" ,
127
127
s " --addPluginSbtFile= $sbtPluginFilePath"
Original file line number Diff line number Diff line change @@ -1202,6 +1202,9 @@ object Build {
1202
1202
baseDirectory.value / " ../language-server/src/dotty/tools/languageserver/config" ,
1203
1203
sbtTestDirectory := baseDirectory.value / " sbt-test" ,
1204
1204
1205
+ // ensure that sbt-dotty is built on sbt 1.4
1206
+ pluginCrossBuild / sbtVersion := " 1.4.9" ,
1207
+
1205
1208
// The batch mode accidentally became the default with no way to disable
1206
1209
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
1207
1210
// We enable it explicitly here to make it clear that we're using it.
Original file line number Diff line number Diff line change 1
- sbt.version =1.4.9
1
+ sbt.version =1.5.0-RC2
You can’t perform that action at this time.
0 commit comments