Merge pull request #35 from lorandszakacs/upgrades

Assorted upgrades

.github/workflows/ci.yml

@@ -9,9 +9,9 @@ name: Continuous Integration
 
 on:
   pull_request:
-    branches: ['*']
+    branches: ['**']
   push:
-    branches: ['*']
+    branches: ['**']
     tags: [v*]
 
 env:
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.0.0, 2.13.5, 2.12.13]
+        scala: [3.0.0, 2.13.6, 2.12.14]
         java: [[email protected]]
     runs-on: ${{ matrix.os }}
     steps:
@@ -53,9 +53,9 @@ jobs:
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Check that workflows are up to date
-        run: sbt ++${{ matrix.scala }} githubWorkflowCheck
+        run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck'
 
-      - run: sbt ++${{ matrix.scala }} ci
+      - run: sbt --client '++${{ matrix.scala }}; ci'
 
       - name: Compress target directories
         run: tar cf targets.tar target sprout/js/target sprout/jvm/target project/target
@@ -109,27 +109,27 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.5)
+      - name: Download target directories (2.13.6)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.5-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.5)
+      - name: Inflate target directories (2.13.6)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.13)
+      - name: Download target directories (2.12.14)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.13)
+      - name: Inflate target directories (2.12.14)
         run: |
           tar xf targets.tar
           rm targets.tar
 
       - name: Import signing key
         run: echo $PGP_SECRET | base64 -d | gpg --import
 
-      - run: sbt ++${{ matrix.scala }} release
+      - run: sbt --client '++${{ matrix.scala }}; release'

CHANGELOG.md

@@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # unreleased
 
-### 0.0.4
+### dependency upgrades
+
+- [shapeless](https://github.com/milessabin/shapeless) `2.3.7` — only used for Scala 2
+
+### internals:
+
+- bump sbt to `1.5.3`
+- bump Scala to `2.13.6` and `2.12.14` respectively
+- bump `sbt-spiewak` to `0.21.0`
+
+# 0.0.4
 
 ### new scala versions:
 

build.sbt

@@ -9,8 +9,8 @@ addCommandAlias("format", ";scalafmtSbt;scalafmtConfig;scalafmtAll")
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
-val Scala212 = "2.12.13"
-val Scala213 = "2.13.5"
+val Scala212 = "2.12.14"
+val Scala213 = "2.13.6"
 val Scala3   = "3.0.0"
 
 //=============================================================================
@@ -62,9 +62,6 @@ ThisBuild / crossScalaVersions := List(Scala3, Scala213, Scala212)
 ThisBuild / versionIntroduced := Map(
   Scala212    -> "0.0.1",
   Scala213    -> "0.0.1",
-  "3.0.0-RC1" -> "0.0.1",
-  "3.0.0-RC2" -> "0.0.2",
-  "3.0.0-RC3" -> "0.0.3",
   Scala3      -> "0.0.4"
 )
 
@@ -89,7 +86,6 @@ lazy val root = project
 
 lazy val sprout = crossProject(JSPlatform, JVMPlatform)
   .settings(commonSettings)
-  .settings(dottyJsSettings(ThisBuild / crossScalaVersions))
   .jsSettings(
     scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
   )

project/plugins.sbt

@@ -2,5 +2,5 @@
 addSbtPlugin("org.scalameta"        % "sbt-scalafmt"             % "2.4.2" )       // https://github.com/scalameta/sbt-scalafmt/releases
 addSbtPlugin("org.scala-js"         % "sbt-scalajs"              % "1.5.1" )       // https://github.com/scala-js/scala-js/releases/
 addSbtPlugin("org.portable-scala"   % "sbt-scalajs-crossproject" % "1.0.0" )       // https://github.com/portable-scala/sbt-crossproject/releases
-addSbtPlugin("com.codecommit"       % "sbt-spiewak-sonatype"     % "0.20.4")       // https://github.com/djspiewak/sbt-spiewak/releases/
-addSbtPlugin("ch.epfl.lamp"         % "sbt-dotty"                % "0.5.5" )       // temporary until sbt-spiewak updates!
+addSbtPlugin("com.codecommit"       % "sbt-spiewak-sonatype"     % "0.21.0")       // https://github.com/djspiewak/sbt-spiewak/releases/
+addSbtPlugin("de.heikoseeberger"    % "sbt-header"               % "5.6.0" )       // https://github.com/sbt/sbt-header/releases