Publish Scala.js binaries for Scala 2.13 (#870)

Co-authored-by: Andrea Peruffo <andrea.peruffo1982@gmail.com>

Author: xerial

.github/workflows/release-js.yml

@@ -27,11 +27,11 @@ jobs:
       - name: Build for Scala.js 0.6.x
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-        run: SCALA_JS_VERSION=0.6.31 ./sbt "projectJS/publishSigned"
+        run: SCALA_JS_VERSION=0.6.31 ./sbt "; + projectJS/publishSigned"
       - name: Build for Scala.js 1.0.x
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-        run: SCALA_JS_VERSION=1.0.0-RC2 ./sbt "projectJS/publishSigned"
+        run: SCALA_JS_VERSION=1.0.0-RC2 ./sbt "; + projectJS/publishSigned"
       - name: Release to Sonatype
         env:
           SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'

.github/workflows/test.yml

@@ -83,3 +83,19 @@ jobs:
       - name: Scala.js test
         # A workaround for Scala.js linker error
         run: ./sbt "; airspecJS/test:fastOptJS; projectJS/test"
+  test_js_2_13:
+    name: Scala.js with Scala 2.13
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: olafurpg/setup-scala@v5
+        with:
+          java-version: adopt@1.11
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cache
+          key: ${{ runner.os }}-scala-js-${{ hashFiles('**/*.sbt') }}
+          restore-keys: ${{ runner.os }}-scala-js-
+      - name: Scala.js test
+        # A workaround for Scala.js linker error
+        run: ./sbt ++2.13.1 "; airspecJS/test:fastOptJS; projectJS/test"

airframe/.jvm/src/main/scala/wvlet/airframe/lifecycle/AddShutdownHook.scala

@@ -13,8 +13,6 @@
  */
 package wvlet.airframe.lifecycle
 
-import java.util.concurrent.atomic.AtomicInteger
-
 import wvlet.log.AirframeLogManager
 
 import scala.collection.mutable

build.sbt

@@ -6,6 +6,7 @@ val SCALA_2_13 = "2.13.1"
 
 val untilScala2_12      = SCALA_2_12 :: SCALA_2_11 :: Nil
 val targetScalaVersions = SCALA_2_13 :: untilScala2_12
+val exceptScala2_11     = SCALA_2_13 :: SCALA_2_12 :: Nil
 
 val SCALATEST_VERSION               = "3.0.8"
 val SCALACHECK_VERSION              = "1.14.3"
@@ -67,6 +68,7 @@ val runTestSequentially = Seq[Setting[_]](parallelExecution in Test := false)
 publishTo in ThisBuild := sonatypePublishToBundle.value
 
 val jsBuildSettings = Seq[Setting[_]](
+  crossScalaVersions := exceptScala2_11,
   coverageEnabled := false
   // Workaround for ' JSCom has been closed' issue
   //parallelExecution in ThisBuild := false
@@ -153,7 +155,7 @@ lazy val jvmProjects2_12: Seq[ProjectReference] = Seq(
   examples
 )
 
-// Scala.js build (only for Scala 2.12)
+// Scala.js build (only for Scala 2.12 + 2.13)
 lazy val jsProjects: Seq[ProjectReference] = Seq(
   airframeJS,
   surfaceJS,
@@ -218,7 +220,7 @@ lazy val projectJS =
   project
     .settings(
       noPublish,
-      crossScalaVersions := Seq(SCALA_2_12)
+      crossScalaVersions := exceptScala2_11
     )
     .aggregate(jsProjects: _*)