Skip to content

Commit ed64ff4

Browse files
committed
bump to sbt 1.5.0-RC2
1 parent ac5bde5 commit ed64ff4

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
@@ -322,12 +322,9 @@ jobs:
322322
- name: Add SBT proxy repositories
323323
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
324324

325-
- name: Test sbt 1.4.x
325+
- name: Test sbt
326326
run: ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
327327

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-
331328
test_java8:
332329
runs-on: [self-hosted, Linux]
333330
container:

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

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

138138
private def forceDoc(projects: String*) =
139139
projects.map(project =>
140-
s""";set $project/Compile/doc/sources ++= ($project/Compile/doc/tastyFiles).value ;$project/doc"""
140+
s""";set $project/Compile/doc/sources ++= ($project/Compile/doc/dotty.tools.sbtplugin.DottyPlugin.autoImport.tastyFiles).value ;$project/doc"""
141141
).mkString(" ")
142142

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

project/Build.scala

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

1205+
// ensure that sbt-dotty is built on sbt 1.4
1206+
pluginCrossBuild / sbtVersion := "1.4.9",
1207+
12051208
// The batch mode accidentally became the default with no way to disable
12061209
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
12071210
// 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)