Merge pull request #3672 from typelevel/update/series/3.x/scala-libra…

…ry-2.13.11 Update scala-library to 2.13.11 in series/3.x
typelevel · Jun 12, 2023 · 9780973 · 9780973
2 parents c388055 + 3257702
commit 9780973
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 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-latest]
-        scala: [3.3.0, 2.12.18, 2.13.10]
+        scala: [3.3.0, 2.12.18, 2.13.11]
         java: [temurin@8, temurin@11, temurin@17, graalvm@11]
         ci: [ciJVM, ciNative, ciJS, ciFirefox, ciChrome]
         exclude:
@@ -252,7 +252,7 @@ jobs:
       - shell: bash
         run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'
 
-      - if: (matrix.scala == '2.13.10' || matrix.scala == '3.3.0') && matrix.ci == 'ciJVM'
+      - if: (matrix.scala == '2.13.11' || matrix.scala == '3.3.0') && matrix.ci == 'ciJVM'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' docs/mdoc
 
@@ -267,7 +267,7 @@ jobs:
         run: example/test-js.sh ${{ matrix.scala }}
 
       - name: Test GraalVM Native Image
-        if: matrix.scala == '2.13.10' && matrix.java == 'graalvm@11' && matrix.os == 'ubuntu-latest'
+        if: matrix.scala == '2.13.11' && matrix.java == 'graalvm@11' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: sbt '++ ${{ matrix.scala }}' graalVMExample/nativeImage graalVMExample/nativeImageRun
 
@@ -277,7 +277,7 @@ jobs:
         run: example/test-native.sh ${{ matrix.scala }}
 
       - name: Scalafix tests
-        if: matrix.scala == '2.13.10' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
+        if: matrix.scala == '2.13.11' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
         shell: bash
         run: |
           cd scalafix
@@ -307,7 +307,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.10]
+        scala: [2.13.11]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -468,52 +468,52 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.10, ciJVM)
+      - name: Download target directories (2.13.11, ciJVM)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciJVM
 
-      - name: Inflate target directories (2.13.10, ciJVM)
+      - name: Inflate target directories (2.13.11, ciJVM)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.10, ciNative)
+      - name: Download target directories (2.13.11, ciNative)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciNative
 
-      - name: Inflate target directories (2.13.10, ciNative)
+      - name: Inflate target directories (2.13.11, ciNative)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.10, ciJS)
+      - name: Download target directories (2.13.11, ciJS)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciJS
 
-      - name: Inflate target directories (2.13.10, ciJS)
+      - name: Inflate target directories (2.13.11, ciJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.10, ciFirefox)
+      - name: Download target directories (2.13.11, ciFirefox)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciFirefox
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciFirefox
 
-      - name: Inflate target directories (2.13.10, ciFirefox)
+      - name: Inflate target directories (2.13.11, ciFirefox)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.10, ciChrome)
+      - name: Download target directories (2.13.11, ciChrome)
         uses: actions/download-artifact@v3
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciChrome
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciChrome
 
-      - name: Inflate target directories (2.13.10, ciChrome)
+      - name: Inflate target directories (2.13.11, ciChrome)
         run: |
           tar xf targets.tar
           rm targets.tar
@@ -551,7 +551,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.10]
+        scala: [2.13.11]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/build.sbt b/build.sbt
@@ -113,7 +113,7 @@ val Windows = "windows-latest"
 val MacOS = "macos-latest"
 
 val Scala212 = "2.12.18"
-val Scala213 = "2.13.10"
+val Scala213 = "2.13.11"
 val Scala3 = "3.3.0"
 
 ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)

diff --git a/std/shared/src/main/scala/cats/effect/std/PQueue.scala b/std/shared/src/main/scala/cats/effect/std/PQueue.scala
@@ -59,7 +59,7 @@ object PQueue {
     assertNonNegative(capacity)
     F.ref(State.empty[F, A]).map { ref =>
       new PQueueImpl[F, A](ref, capacity) {
-        implicit val Ord = O
+        implicit val Ord: Order[A] = O
       }
     }
   }

diff --git a/std/shared/src/main/scala/cats/effect/std/internal/BinomialHeap.scala b/std/shared/src/main/scala/cats/effect/std/internal/BinomialHeap.scala
@@ -66,7 +66,7 @@ private[std] object BinomialHeap {
 
   def apply[A](trees: List[BinomialTree[A]])(implicit ord: Order[A]) =
     new BinomialHeap[A](trees) {
-      implicit val Ord = ord
+      implicit val Ord: Order[A] = ord
     }
 
   /**