From 4a34eb2d13d126a7cd076fb2e0d1e480dccbcd8e Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Sun, 12 Sep 2021 14:58:31 +0000 Subject: [PATCH] Cross-build for Scala 2.11 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- .../scalajs/macrotaskexecutor/MacrotaskExecutorSuite.scala | 4 ++-- .../scalajs/macrotaskexecutor/WebWorkerMacrotaskSuite.scala | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7bcec4..5207dce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.14, 2.13.6, 3.0.2] + scala: [2.11.12, 2.12.14, 2.13.6, 3.0.2] java: [adopt@1.8] ci: [ciNode, ciFirefox, ciChrome, ciJSDOMNodeJS] runs-on: ${{ matrix.os }} diff --git a/build.sbt b/build.sbt index 7fb5741..de356d9 100644 --- a/build.sbt +++ b/build.sbt @@ -45,7 +45,7 @@ ThisBuild / scmInfo := Some( // build and matrix configuration -ThisBuild / crossScalaVersions := Seq("2.12.14", "2.13.6", "3.0.2") +ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.14", "2.13.6", "3.0.2") ThisBuild / githubWorkflowBuildPreamble ++= Seq( WorkflowStep.Use( diff --git a/core/src/test/scala/org/scalajs/macrotaskexecutor/MacrotaskExecutorSuite.scala b/core/src/test/scala/org/scalajs/macrotaskexecutor/MacrotaskExecutorSuite.scala index 328f25b..1e31239 100644 --- a/core/src/test/scala/org/scalajs/macrotaskexecutor/MacrotaskExecutorSuite.scala +++ b/core/src/test/scala/org/scalajs/macrotaskexecutor/MacrotaskExecutorSuite.scala @@ -30,7 +30,7 @@ class MacrotaskExecutorSuite extends FunSuite { if (n <= 0) Future(0) else - Future.unit.flatMap(_ => loop(n - 1)).map(_ + 1) + Future.successful(()).flatMap(_ => loop(n - 1)).map(_ + 1) val start = System.currentTimeMillis() val MinimumClamp = 10000 * 2 * 4 // HTML5 specifies a 4ms clamp (https://developer.mozilla.org/en-US/docs/Web/API/WindowTimers.setTimeout#Minimum.2F_maximum_delay_and_timeout_nesting) @@ -52,7 +52,7 @@ class MacrotaskExecutorSuite extends FunSuite { def loop(): Future[Unit] = Future(cancel) flatMap { canceled => if (canceled) - Future.unit + Future.successful(()) else loop() } diff --git a/webworker/src/test/scala/org/scalajs/macrotaskexecutor/WebWorkerMacrotaskSuite.scala b/webworker/src/test/scala/org/scalajs/macrotaskexecutor/WebWorkerMacrotaskSuite.scala index 9d28562..e5b4eab 100644 --- a/webworker/src/test/scala/org/scalajs/macrotaskexecutor/WebWorkerMacrotaskSuite.scala +++ b/webworker/src/test/scala/org/scalajs/macrotaskexecutor/WebWorkerMacrotaskSuite.scala @@ -17,6 +17,7 @@ package org.scalajs.macrotaskexecutor import munit.FunSuite +import org.scalajs.dom.MessageEvent import org.scalajs.dom.webworkers.Worker import scala.concurrent.Promise @@ -41,7 +42,7 @@ class WebWorkerMacrotaskSuite extends FunSuite { s"file://${targetDir}/scala-js-macrotask-executor-webworker-fastopt/main.js" ) - worker.onmessage = { event => + worker.onmessage = { (event: MessageEvent) => event.data match { case log: String => println(log) case success: Boolean => p.success(success)