Merge pull request #4148 from mzuehlke/scala-2.13.15-with-fixes

Update to Scala 2.13.15 and fix Any inference
typelevel · Sep 30, 2024 · 0d5886a · 0d5886a
2 parents 7964725 + 8e054c5
commit 0d5886a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
-        scala: [3.3.3, 2.12.20, 2.13.14]
+        scala: [3.3.3, 2.12.20, 2.13.15]
         java:
           - temurin@8
           - temurin@11
@@ -256,7 +256,7 @@ jobs:
       - shell: bash
         run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'
 
-      - if: (matrix.scala == '2.13.14' || matrix.scala == '3.3.3') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
+      - if: (matrix.scala == '2.13.15' || matrix.scala == '3.3.3') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' docs/mdoc
 
@@ -271,7 +271,7 @@ jobs:
         run: example/test-js.sh ${{ matrix.scala }}
 
       - name: Test GraalVM Native Image
-        if: matrix.scala == '2.13.14' && matrix.java == 'graalvm@17' && matrix.os == 'ubuntu-latest'
+        if: matrix.scala == '2.13.15' && matrix.java == 'graalvm@17' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' graalVMExample/nativeImage graalVMExample/nativeImageRun
 
@@ -281,7 +281,7 @@ jobs:
         run: example/test-native.sh ${{ matrix.scala }}
 
       - name: Scalafix tests
-        if: matrix.scala == '2.13.14' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
+        if: matrix.scala == '2.13.15' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           cd scalafix
@@ -452,52 +452,52 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.14, ciJVM)
+      - name: Download target directories (2.13.15, ciJVM)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciJVM
 
-      - name: Inflate target directories (2.13.14, ciJVM)
+      - name: Inflate target directories (2.13.15, ciJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.14, ciNative)
+      - name: Download target directories (2.13.15, ciNative)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciNative
 
-      - name: Inflate target directories (2.13.14, ciNative)
+      - name: Inflate target directories (2.13.15, ciNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.14, ciJS)
+      - name: Download target directories (2.13.15, ciJS)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciJS
 
-      - name: Inflate target directories (2.13.14, ciJS)
+      - name: Inflate target directories (2.13.15, ciJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.14, ciFirefox)
+      - name: Download target directories (2.13.15, ciFirefox)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciFirefox
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciFirefox
 
-      - name: Inflate target directories (2.13.14, ciFirefox)
+      - name: Inflate target directories (2.13.15, ciFirefox)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.14, ciChrome)
+      - name: Download target directories (2.13.15, ciChrome)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-ciChrome
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-ciChrome
 
-      - name: Inflate target directories (2.13.14, ciChrome)
+      - name: Inflate target directories (2.13.15, ciChrome)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -113,7 +113,7 @@ val Windows = "windows-latest"
 val MacOS = "macos-14"
 
 val Scala212 = "2.12.20"
-val Scala213 = "2.13.14"
+val Scala213 = "2.13.15"
 val Scala3 = "3.3.3"
 
 ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)

diff --git a/tests/shared/src/test/scala/cats/effect/ResourceSpec.scala b/tests/shared/src/test/scala/cats/effect/ResourceSpec.scala
@@ -986,7 +986,7 @@ class ResourceSpec extends BaseSpec with ScalaCheck with Discipline {
             case Left(()) =>
               acquiredRight.get.ifM(loserReleased.get.map(_ must beRight[Unit]), IO.pure(ok))
             case Right(()) =>
-              acquiredLeft.get.ifM(loserReleased.get.map(_ must beLeft[Unit]).void, IO.pure(ok))
+              acquiredLeft.get.ifM(loserReleased.get.map(_ must beLeft[Unit]), IO.pure(ok))
           }
         }