Merge pull request #274 from nafg/update/scala-library-2.12.18

Update scala-library to 2.12.18
nafg · Nov 20, 2023 · a53de76 · a53de76
2 parents cd7eea8 + 78ccf36
commit a53de76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.17, 2.13.10]
+        scala: [2.12.18, 2.13.10]
         java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -101,12 +101,12 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.17)
+      - name: Download target directories (2.12.18)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.17)
+      - name: Inflate target directories (2.12.18)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/.mergify.yml b/.mergify.yml
@@ -8,7 +8,7 @@ pull_request_rules:
       - or:
           - author=scala-steward
           - author=nafg-scala-steward[bot]
-      - check-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11)
+      - check-success=Build and Test (ubuntu-latest, 2.12.18, temurin@11)
       - check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11)
     actions:
         queue:

diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
 inThisBuild(List(
-  crossScalaVersions := Seq("2.12.17", "2.13.10"),
+  crossScalaVersions := Seq("2.12.18", "2.13.10"),
   scalaVersion := crossScalaVersions.value.last,
   organization := "io.github.nafg.slick-migration-api"
 ))