Merge pull request #48 from polyvariant/scala-2.12.14

Remove 2.12.11, add 2.12.14
polyvariant · May 29, 2021 · 36213d4 · 36213d4
2 parents 22c557d + 857ea02
commit 36213d4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,9 +28,9 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala:
-          - 2.12.11
           - 2.12.12
           - 2.12.13
+          - 2.12.14
           - 2.13.4
           - 2.13.5
           - 2.13.6
@@ -108,32 +108,32 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.11)
+      - name: Download target directories (2.12.12)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.11)
+      - name: Inflate target directories (2.12.12)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.12.12)
+      - name: Download target directories (2.12.13)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.12)
+      - name: Inflate target directories (2.12.13)
         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

diff --git a/.mergify.yml b/.mergify.yml
@@ -2,9 +2,9 @@ pull_request_rules:
   - name: automatically merge Scala Steward PRs on CI success
     conditions:
       - author=scala-steward
-      - status-success="Build and Test (ubuntu-latest, 2.12.11, [email protected])"
       - status-success="Build and Test (ubuntu-latest, 2.12.12, [email protected])"
       - status-success="Build and Test (ubuntu-latest, 2.12.13, [email protected])"
+      - status-success="Build and Test (ubuntu-latest, 2.12.14, [email protected])"
       - status-success="Build and Test (ubuntu-latest, 2.13.4, [email protected])"
       - status-success="Build and Test (ubuntu-latest, 2.13.5, [email protected])"
       - status-success="Build and Test (ubuntu-latest, 2.13.6, [email protected])"

diff --git a/build.sbt b/build.sbt
@@ -29,9 +29,9 @@ ThisBuild / resolvers += Resolver.JCenterRepository
 
 ThisBuild / scalaVersion := "3.0.0"
 ThisBuild / crossScalaVersions := Seq(
-  "2.12.11",
   "2.12.12",
   "2.12.13",
+  "2.12.14",
   //
   "2.13.4",
   "2.13.5",