Merge pull request #29 from xuwei-k/final-object

Add Scala 3 build

Author: sjrd

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         nodejsversion: ["15"]
-        scalaversion: ["2.11.12", "2.12.11", "2.13.2"]
+        scalaversion: ["2.11.12", "2.12.11", "2.13.2", "3.x"]
         project: ["scalajs-js-envs", "scalajs-js-envs-test-kit", "scalajs-env-nodejs"]
         include:
           - nodejsversion: "16"

build.sbt

@@ -1,13 +1,13 @@
 import com.typesafe.tools.mima.core.{Problem, ProblemFilters}
 
 val previousVersion: Option[String] = Some("1.4.0")
-val newScalaBinaryVersionsInThisRelease: Set[String] = Set()
+val newScalaBinaryVersionsInThisRelease: Set[String] = Set("3")
 
 inThisBuild(Def.settings(
   version := "1.4.1-SNAPSHOT",
   organization := "org.scala-js",
   scalaVersion := "2.12.11",
-  crossScalaVersions := Seq("2.11.12", "2.12.11", "2.13.2"),
+  crossScalaVersions := Seq("2.11.12", "2.12.11", "2.13.2", "3.3.7"),
   scalacOptions ++= Seq(
     "-deprecation",
     "-feature",
@@ -108,6 +108,7 @@ val commonSettings = Def.settings(
         Set(prevProjectID)
     }
   },
+  mimaFailOnNoPrevious := !newScalaBinaryVersionsInThisRelease.contains(scalaBinaryVersion.value),
 )
 
 lazy val root = project
@@ -118,7 +119,7 @@ lazy val `scalajs-js-envs` = project
   .settings(
     commonSettings,
     libraryDependencies ++= Seq(
-      "org.scala-js" %% "scalajs-logging" % "1.1.1",
+      "org.scala-js" %% "scalajs-logging" % "1.2.0",
       "com.novocode" % "junit-interface" % "0.11" % "test",
     ),
   )

js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/kit/MsgHandler.scala

@@ -43,8 +43,12 @@ private[kit] final class MsgHandler {
     notifyAll()
   }
 
-  @tailrec
   def waitOnMessage(deadline: Deadline): String = synchronized {
+    waitOnMessageLoop(deadline)
+  }
+
+  @tailrec
+  private def waitOnMessageLoop(deadline: Deadline): String = {
     if (msgs.nonEmpty) {
       val (msg, newMsgs) = msgs.dequeue
       msgs = newMsgs
@@ -60,7 +64,7 @@ private[kit] final class MsgHandler {
       }
 
       wait(millis)
-      waitOnMessage(deadline)
+      waitOnMessageLoop(deadline)
     }
   }
 

js-envs/src/main/scala/org/scalajs/jsenv/RunConfig.scala

@@ -119,7 +119,7 @@ final class RunConfig private (
   }
 }
 
-final object RunConfig {
+object RunConfig {
   type OnOutputStream = (Option[InputStream], Option[InputStream]) => Unit
   def apply(): RunConfig = new RunConfig()
 

nodejs-env/src/main/scala/org/scalajs/jsenv/nodejs/ComSupport.scala

@@ -235,7 +235,7 @@ object ComRun {
       jvm2js: DataOutputStream,
       js2jvm: DataInputStream) extends State
 
-  private final case object Closing extends State
+  private case object Closing extends State
 
   private def writeMsg(s: DataOutputStream, msg: String): Unit = {
     s.writeInt(msg.length)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.11.7