Skip to content

Commit 0bbe312

Browse files
committed
bump to sbt 1.5.0-RC2
1 parent bcf6c72 commit 0bbe312

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,12 +348,9 @@ jobs:
348348
- name: Add SBT proxy repositories
349349
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
350350

351-
- name: Test sbt 1.4.x
351+
- name: Test sbt
352352
run: ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
353353

354-
- name: Test sbt 1.5.x
355-
run: ./project/scripts/sbt "set \`sbt-dotty\`/scriptedSbt := \"1.5.0-RC1\"; sbt-dotty/scripted sbt-dotty/*"
356-
357354
test_java8:
358355
runs-on: [self-hosted, Linux]
359356
container:

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ final case class SbtCommunityProject(
124124
case Some(ivyHome) => List(s"-Dsbt.ivy.home=$ivyHome")
125125
case _ => Nil
126126
extraSbtArgs ++ sbtProps ++ List(
127-
"-sbt-version", "1.4.9",
127+
"-sbt-version", "1.5.0-RC2",
128128
"-Dsbt.supershell=false",
129129
s"-Ddotty.communitybuild.dir=$communitybuildDir",
130130
s"--addPluginSbtFile=$sbtPluginFilePath"
@@ -140,7 +140,7 @@ object projects:
140140

141141
private def forceDoc(projects: String*) =
142142
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"""
144144
).mkString(" ")
145145

146146
private def aggregateDoc(in: String)(projects: String*) =

project/Build.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,6 +1243,9 @@ object Build {
12431243
baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config",
12441244
sbtTestDirectory := baseDirectory.value / "sbt-test",
12451245

1246+
// ensure that sbt-dotty is built on sbt 1.4
1247+
pluginCrossBuild / sbtVersion := "1.4.9",
1248+
12461249
// The batch mode accidentally became the default with no way to disable
12471250
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
12481251
// We enable it explicitly here to make it clear that we're using it.

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.9
1+
sbt.version=1.5.0-RC2

0 commit comments

Comments
 (0)