Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): Update sbt, scripted-plugin from 1.9.7 to 1.9.8 #5946

Merged
merged 2 commits into from
Dec 15, 2023
Merged

build(deps): Update sbt, scripted-plugin from 1.9.7 to 1.9.8 #5946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19539c6
build(deps): Update sbt, scripted-plugin from 1.9.7 to 1.9.8
scalameta-bot Dec 15, 2023
daa4ba5
Make the sbt tests pass
tgodzik Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.7
sbt.version=1.9.8
8 changes: 7 additions & 1 deletion tests/slow/src/test/scala/tests/sbt/SbtStepDapSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package tests.sbt

import scala.meta.internal.metals.BuildInfo

import tests.SbtBuildLayout
import tests.SbtServerInitializer
import tests.debug.BaseStepDapSuite
Expand All @@ -9,4 +11,8 @@ class SbtStepDapSuite
s"sbt-debug-step",
SbtServerInitializer,
SbtBuildLayout,
)
) {

// otherwise we get both Scala 2.12 and 2.13 dependencies, whchich is more tricky for the tests
override def scalaVersion: String = BuildInfo.scala212
}
2 changes: 1 addition & 1 deletion tests/unit/src/main/scala/tests/debug/BaseStepDapSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ abstract class BaseStepDapSuite(
.at("a/src/main/scala/Main.scala", line = 5)(StepIn)
.atDependency(
server.toPathFromSymbol("scala.Predef", "scala/Predef.scala"),
line = 427,
line = if (scalaVersion.startsWith("2.13")) 427 else 405,
)(Continue)
},
)
Expand Down