Drop 0.6 and cleanups

Author: armanbilge

.github/workflows/ci.yml

@@ -13,24 +13,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scalaversion: ["2.11.12", "2.12.10", "2.13.1"]
-        scalajsversion: ["1.x", "0.6.x"]
-        include:
-          - scalaversion: "2.10.7"
-            scalajsversion: "0.6.x"
-    env:
-      SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
+        scalaversion: ["2.11.12", "2.12.10", "2.13.1", "3.0.1"]
     steps:
 
       - uses: actions/checkout@v2
 
       - name: Setup Scala
         uses: japgolly/[email protected]
 
-      - name: Hacks for Scala 2.10
-        if: matrix.scalaversion == '2.10.7'
-        run: ./prepareForScala210.sh
-
       - name: Build
         run: sbt "++${{ matrix.scalaversion }}" package
 
@@ -44,7 +34,7 @@ jobs:
         run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck
 
       - name: Validate api report
-        if: matrix.scalajsversion == '1.x' && matrix.scalaversion != '2.11.12'
+        if: matrix.scalaversion != '2.11.12'
         run: ./api-reports/validate "${{ matrix.scalaversion }}"
 
   readme:

build.sbt

@@ -1,31 +1,23 @@
-import _root_.scalafix.sbt.BuildInfo.scalafixVersion // delete if Scala 2.10
+import _root_.scalafix.sbt.BuildInfo.scalafixVersion
 import scalatex.ScalatexReadme
 
 ThisBuild / shellPrompt := ((s: State) => Project.extract(s).currentRef.project + "> ")
 
-// Issue #504 - remove on 2.x branch
-// Our release GitHub Actions job performs the release for SJS 0.6 and 1.0 in parallel.
-// This prevents each parallel processes from removing each other's deployment.
-sonatypeSessionName := s"${name.value} v${version.value} (SJS $scalaJSVersion)"
-
 lazy val scalafixRules = project
   .in(file("scalafix"))
   .settings(
-    libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion, // delete if Scala 2.10
+    libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion,
   )
 
 lazy val root = project
   .in(file("."))
   .enablePlugins(ScalaJSPlugin)
-  .enablePlugins(ScalafixPlugin) // delete if Scala 2.10
-  .dependsOn(scalafixRules % ScalafixConfig) // delete if Scala 2.10
+  .enablePlugins(ScalafixPlugin)
+  .dependsOn(scalafixRules % ScalafixConfig)
 
 name := "Scala.js DOM"
 
-ThisBuild / crossScalaVersions := {
-  if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
-  else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
-}
+ThisBuild / crossScalaVersions := Seq("2.12.10", "2.11.12", "2.13.1", "3.0.1")
 ThisBuild / scalaVersion := crossScalaVersions.value.head
 
 val commonSettings = Seq(
@@ -56,7 +48,6 @@ scalacOptions ++= {
 }
 
 def hasNewCollections(version: String): Boolean = {
-  !version.startsWith("2.10.") &&
   !version.startsWith("2.11.") &&
   !version.startsWith("2.12.")
 }
@@ -73,11 +64,6 @@ inConfig(Compile)(Def.settings(
     collectionsEraDependentDirectory(scalaVersion.value, sourceDirectory.value)
 ))
 
-scalacOptions ++= {
-  if (scalaJSVersion.startsWith("0.6.")) Seq("-P:scalajs:sjsDefinedByDefault")
-  else Nil
-}
-
 versionScheme := Some("early-semver")
 
 pomExtra := (
@@ -138,6 +124,5 @@ ThisBuild / prePR_nonCross := Def.sequential(
   root / clean,
   root / Compile / scalafmt,
   root / Compile / compile,
-  (root / Compile / scalafix).toTask(""), // delete if Scala 2.10
   example / Compile / compile,
 ).value

prepareForScala210.sh

@@ -1,12 +1,9 @@
-val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.0.0")
-
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
 
 addSbtPlugin("com.lihaoyi" % "scalatex-sbt-plugin" % "0.3.11")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.0")
 
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
 
-addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix" % "0.9.29") // delete if Scala 2.10
+addSbtPlugin("ch.epfl.scala"  % "sbt-scalafix" % "0.9.29")