drop Scala.js 0.6.x

scalameta · Nov 8, 2020 · 3a440f2 · 3a440f2
1 parent 7ea3075
commit 3a440f2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,15 +23,12 @@ jobs:
   js:
     strategy:
       fail-fast: false
-      matrix:
-        scalajs: ["1.3.0", "0.6.32"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v7
       - run: sbt +testsJS/test
         env:
-          SCALAJS_VERSION: ${{ matrix.scalajs }}
           GOOGLE_APPLICATION_CREDENTIALS:
             ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
           GOOGLE_APPLICATION_CREDENTIALS_JSON:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,6 @@ jobs:
       - name: Publish ${{ github.ref }}
         run: |
           sbt ci-release
-          SCALAJS_VERSION=0.6.32 sbt clean sonatypeBundleClean ci-release
           sbt docs/docusaurusPublishGhpages
         env:
           GIT_USER: munit@scalameta.org

diff --git a/build.sbt b/build.sbt
@@ -4,8 +4,7 @@ import com.typesafe.tools.mima.core.MissingTypesProblem
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 import sbtcrossproject.CrossPlugin.autoImport.CrossType
 import scala.collection.mutable
-val customScalaJSVersion = Option(System.getenv("SCALAJS_VERSION"))
-val scalaJSVersion = customScalaJSVersion.getOrElse("1.3.0")
+val scalaJSVersion = "1.3.0"
 val scalaNativeVersion = "0.4.0-M2"
 def previousVersion = "0.7.0"
 def scala213 = "2.13.2"
@@ -151,7 +150,6 @@ lazy val junit = project
     mimaEnable,
     moduleName := "junit-interface",
     description := "A Java implementation of sbt's test interface for JUnit 4",
-    skip in publish := customScalaJSVersion.isDefined,
     autoScalaLibrary := false,
     crossPaths := false,
     sbtPlugin := false,
@@ -202,7 +200,6 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .nativeConfigure(sharedNativeConfigure)
   .nativeSettings(
     sharedNativeSettings,
-    skip in publish := customScalaJSVersion.isDefined,
     libraryDependencies ++= List(
       "org.scala-native" %%% "test-interface" % scalaNativeVersion
     )
@@ -217,7 +214,6 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   )
   .jvmSettings(
     sharedJVMSettings,
-    skip in publish := customScalaJSVersion.isDefined,
     libraryDependencies ++= List(
       "junit" % "junit" % "4.13.1"
     )
@@ -234,7 +230,6 @@ lazy val plugin = project
     sharedSettings,
     moduleName := "sbt-munit",
     sbtPlugin := true,
-    skip in publish := customScalaJSVersion.isDefined,
     scalaVersion := scala212,
     crossScalaVersions := List(scala212),
     buildInfoPackage := "munit.sbtmunit",
@@ -257,13 +252,11 @@ lazy val munitScalacheck = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.15.0"
   )
   .jvmSettings(
-    sharedJVMSettings,
-    skip in publish := customScalaJSVersion.isDefined
+    sharedJVMSettings
   )
   .nativeConfigure(sharedNativeConfigure)
   .nativeSettings(
-    sharedNativeSettings,
-    skip in publish := customScalaJSVersion.isDefined
+    sharedNativeSettings
   )
   .jsConfigure(sharedJSConfigure)
   .jsSettings(sharedJSSettings)
@@ -305,7 +298,6 @@ lazy val docs = project
   .settings(
     sharedSettings,
     moduleName := "munit-docs",
-    skip in publish := customScalaJSVersion.isDefined,
     crossScalaVersions := List(scala213, scala212),
     unmanagedSources.in(Compile) += sourceDirectory
       .in(plugin, Compile)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,3 @@
-val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.3.0")
-
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.11")
@@ -10,7 +7,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.23")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0-M2")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.3.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
 
 libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "1.113.2"