Merge pull request #4528 from gzm0/no-run-interruptible

sjrd · web-flow · commit 907d05209ebb · 2021-07-12T10:30:27.000+02:00
Rely on sbt's run cancellation rather than building our own
diff --git a/project/BinaryIncompatibilities.scala b/project/BinaryIncompatibilities.scala
@@ -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(
diff --git a/sbt-plugin/src/main/scala/org/scalajs/sbtplugin/Run.scala b/sbt-plugin/src/main/scala/org/scalajs/sbtplugin/Run.scala
diff --git a/sbt-plugin/src/main/scala/org/scalajs/sbtplugin/ScalaJSPluginInternal.scala b/sbt-plugin/src/main/scala/org/scalajs/sbtplugin/ScalaJSPluginInternal.scala
@@ -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 := {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ object BinaryIncompatibilities {`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`val SbtPlugin = Seq(`
	`17`	`+ // private[sbtplugin], not an issue.`
	`18`	`+ exclude[MissingClassProblem]("org.scalajs.sbtplugin.Run"),`
	`19`	`+ exclude[MissingClassProblem]("org.scalajs.sbtplugin.Run$"),`
`17`	`20`	`)`
`18`	`21`
`19`	`22`	`val TestCommon = Seq(`