File tree 4 files changed +7
-7
lines changed
4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -360,12 +360,9 @@ jobs:
360
360
- name : Add SBT proxy repositories
361
361
run : cp -vf .github/workflows/repositories /root/.sbt/ ; true
362
362
363
- - name : Test sbt 1.4.x
363
+ - name : Test sbt
364
364
run : ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
365
365
366
- - name : Test sbt 1.5.x
367
- run : ./project/scripts/sbt "set \`sbt-dotty\`/scriptedSbt := \"1.5.0-RC1\"; sbt-dotty/scripted sbt-dotty/*"
368
-
369
366
test_java8 :
370
367
runs-on : [self-hosted, Linux]
371
368
container :
Original file line number Diff line number Diff line change @@ -124,7 +124,7 @@ final case class SbtCommunityProject(
124
124
case Some (ivyHome) => List (s " -Dsbt.ivy.home= $ivyHome" )
125
125
case _ => Nil
126
126
extraSbtArgs ++ sbtProps ++ List (
127
- " -sbt-version" , " 1.4.9 " ,
127
+ " -sbt-version" , " 1.5.0 " ,
128
128
" -Dsbt.supershell=false" ,
129
129
s " -Ddotty.communitybuild.dir= $communitybuildDir" ,
130
130
s " --addPluginSbtFile= $sbtPluginFilePath"
@@ -140,7 +140,7 @@ object projects:
140
140
141
141
private def forceDoc (projects : String * ) =
142
142
projects.map(project =>
143
- s """ ;set $project/Compile/doc/sources ++= ( $project/Compile/doc/tastyFiles).value ; $project/doc """
143
+ s """ ;set $project/Compile/doc/sources ++= ( $project/Compile/doc/dotty.tools.sbtplugin.DottyPlugin.autoImport. tastyFiles).value ; $project/doc """
144
144
).mkString(" " )
145
145
146
146
private def aggregateDoc (in : String )(projects : String * ) =
Original file line number Diff line number Diff line change @@ -1248,6 +1248,9 @@ object Build {
1248
1248
baseDirectory.value / " ../language-server/src/dotty/tools/languageserver/config" ,
1249
1249
sbtTestDirectory := baseDirectory.value / " sbt-test" ,
1250
1250
1251
+ // ensure that sbt-dotty is built on sbt 1.4
1252
+ pluginCrossBuild / sbtVersion := " 1.4.9" ,
1253
+
1251
1254
// The batch mode accidentally became the default with no way to disable
1252
1255
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
1253
1256
// 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
You can’t perform that action at this time.
0 commit comments