Merge pull request #166 from rpiaggio/github-actions

Drop support for Scala 2.11 & Scala.js 0.6.
typelevel · Aug 18, 2020 · 3c001d6 · 3c001d6
2 parents 8b121c8 + 7485127
commit 3c001d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 31 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,20 +5,15 @@ env:
   SCALA_VERSION: 2.12.12 # Used only for Doc Site
 jobs:
   validate:
-    name: Scala ${{ matrix.scala }}, Java ${{ matrix.java }}, Scala.js ${{ matrix.scalajs }}
+    name: Scala ${{ matrix.scala }}, Java ${{ matrix.java }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         java: [[email protected], [email protected], [email protected]]
-        scala: [2.11.12, 2.12.12, 2.13.3]
-        scalajs: [0.6.33, 1.1.1]
-        exclude:
-          - scala: 2.11.12
-            scalajs: 1.1.1
+        scala: [2.12.12, 2.13.3]
     env:
       SCALA_VERSION: ${{ matrix.scala }}
-      SCALAJS_VERSION: ${{ matrix.scalajs }}
     steps:
       - uses: actions/checkout@v2
         with:

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -34,7 +34,6 @@ jobs:
       - name: Publish
         run: |
           csbt ci-release
-          SCALAJS_VERSION=0.6.33 csbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,5 @@
 import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
-val customScalaJSVersion = Option(System.getenv("SCALAJS_VERSION"))
-
 lazy val `cats-time` = project
   .in(file("."))
   .disablePlugins(MimaPlugin)
@@ -18,9 +16,6 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
   .jsSettings(
     libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.0.0"
   )
-  .jvmSettings(
-    skip.in(publish) := customScalaJSVersion.isDefined
-  )
 
 lazy val coreJS = core.js
 lazy val coreJVM = core.jvm
@@ -34,14 +29,6 @@ lazy val docs = project
   .enablePlugins(MdocPlugin)
   .settings(mdocIn := sourceDirectory.value / "main" / "mdoc")
 
-val catsV = Def.setting(if (scalaBinaryVersion.value == "2.11") "2.0.0" else "2.1.1")
-val catsTestkitV = Def.setting(
-  if (scalaBinaryVersion.value == "2.11") "1.0.0-RC1"
-  else if (customScalaJSVersion.isDefined) "1.0.1"
-  else "2.0.0"
-)
-val github4sV = Def.setting(if (scalaBinaryVersion.value == "2.11") "0.20.1" else "0.24.1")
-
 lazy val contributors = Seq(
   "ChristopherDavenport" -> "Christopher Davenport"
 )
@@ -50,13 +37,13 @@ lazy val contributors = Seq(
 lazy val commonSettings = Seq(
   organization := "io.chrisdavenport",
   scalaVersion := "2.13.3",
-  crossScalaVersions := Seq(scalaVersion.value, "2.12.12", "2.11.12"),
+  crossScalaVersions := Seq(scalaVersion.value, "2.12.12"),
   addCompilerPlugin("org.typelevel" % "kind-projector"     % "0.11.0" cross CrossVersion.full),
   addCompilerPlugin("com.olegpy"   %% "better-monadic-for" % "0.3.1"),
   libraryDependencies ++= Seq(
-    "org.typelevel" %%% "cats-core"                        % catsV.value,
-    "org.scala-lang.modules" %%% "scala-collection-compat" % "2.1.6"            % Test,
-    "org.typelevel" %%% "cats-testkit-scalatest"           % catsTestkitV.value % Test
+    "org.typelevel" %%% "cats-core"                        % "2.1.1",
+    "org.scala-lang.modules" %%% "scala-collection-compat" % "2.1.6" % Test,
+    "org.typelevel" %%% "cats-testkit-scalatest"           % "2.0.0" % Test
   )
 )
 
@@ -155,7 +142,7 @@ lazy val micrositeSettings = Seq(
     "-Ywarn-unused:imports",
     "-Xlint:-missing-interpolator,_"
   ),
-  libraryDependencies += "com.47deg" %% "github4s" % github4sV.value,
+  libraryDependencies += "com.47deg" %% "github4s" % "0.24.1",
   micrositePushSiteWith := GitHub4s,
   micrositeGitterChannel := true,
   micrositeGitterChannelUrl := "typelevel/cats",

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,3 @@
-import scala.util.Properties._
-
-val scalaJSVersion = envOrElse("SCALAJS_VERSION", "1.1.1")
-
 addSbtPlugin("com.dwijnand"              % "sbt-travisci"             % "1.2.0")
 addSbtPlugin("com.typesafe.sbt"          % "sbt-git"                  % "1.0.0")
 addSbtPlugin("com.jsuereth"              % "sbt-pgp"                  % "2.0.1")
@@ -17,4 +13,4 @@ addSbtPlugin("pl.project13.scala"        % "sbt-jmh"                  % "0.3.7")
 addSbtPlugin("com.timushev.sbt"          % "sbt-updates"              % "0.5.1")
 addSbtPlugin("org.portable-scala"        % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("com.geirsson"              % "sbt-ci-release"           % "1.5.3")
-addSbtPlugin("org.scala-js"              % "sbt-scalajs"              % scalaJSVersion)
+addSbtPlugin("org.scala-js"              % "sbt-scalajs"              % "1.1.1")