Merge branch 'main' into update/sbt-tpolecat-0.1.20

Author: bpholt

.github/workflows/ci.yml

@@ -9,9 +9,9 @@ name: Continuous Integration
 
 on:
   pull_request:
-    branches: ['*']
+    branches: ['**']
   push:
-    branches: ['*']
+    branches: ['**']
     tags: [v*]
 
 env:
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.6, 2.12.13, 3.0.0-RC1, 3.0.0-RC2]
+        scala: [2.13.6, 2.12.14, 3.0.0-RC1, 3.0.0-RC2]
         java: [[email protected], [email protected]]
     runs-on: ${{ matrix.os }}
     steps:
@@ -50,10 +50,10 @@ 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'
 
       - name: Build project
-        run: sbt ++${{ matrix.scala }} test
+        run: sbt --client '++${{ matrix.scala }}; test'
 
       - name: Compress target directories
         run: tar cf targets.tar target core/js/target core/jvm/target project/target
@@ -107,12 +107,12 @@ jobs:
           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
@@ -142,4 +142,4 @@ jobs:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-        run: sbt ++${{ matrix.scala }} ci-release
+        run: sbt --client '++${{ matrix.scala }}; ci-release'

build.sbt

@@ -4,7 +4,7 @@ import sbtcrossproject.CrossPlugin.autoImport.CrossType
 import scala.collection.immutable
 
 lazy val V = new {
-  val SCALA_2_12 = "2.12.13"
+  val SCALA_2_12 = "2.12.14"
   val SCALA_2_13 = "2.13.6"
   val SCALA_3_RC1 = "3.0.0-RC1"
   val SCALA_3_RC2 = "3.0.0-RC2"

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.2
+sbt.version=1.5.3

project/plugins.sbt

@@ -1,5 +1,5 @@
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
-addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.10.1")
+addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.11.0")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")