Skip to content

Rely on sbt's run cancellation rather than building our own #4528

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

Merged
merged 1 commit into from
Jul 12, 2021
Merged

Rely on sbt's run cancellation rather than building our own #4528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions project/BinaryIncompatibilities.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ object BinaryIncompatibilities {
)

val SbtPlugin = Seq(
// private[sbtplugin], not an issue.
exclude[MissingClassProblem]("org.scalajs.sbtplugin.Run"),
exclude[MissingClassProblem]("org.scalajs.sbtplugin.Run$"),
)

val TestCommon = Seq(
Expand Down
58 changes: 0 additions & 58 deletions sbt-plugin/src/main/scala/org/scalajs/sbtplugin/Run.scala
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions sbt-plugin/src/main/scala/org/scalajs/sbtplugin/ScalaJSPluginInternal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,14 @@ private[sbtplugin] object ScalaJSPluginInternal {
val env = jsEnv.value

val className = mainClass.value.getOrElse("<unknown class>")
log.info(s"Running $className. Hit any key to interrupt.")
log.info(s"Running $className.")
log.debug(s"with JSEnv ${env.name}")

val input = jsEnvInput.value
val config = RunConfig().withLogger(sbtLogger2ToolsLogger(log))

Run.runInterruptible(env, input, config)
val run = env.start(input, config)
Await.result(run.future, Duration.Inf)
},

runMain := {
Expand Down