Skip to content

Commit 9780973

Browse files
authored
Merge pull request #3672 from typelevel/update/series/3.x/scala-library-2.13.11
Update scala-library to 2.13.11 in series/3.x
2 parents c388055 + 3257702 commit 9780973

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
os: [ubuntu-latest, windows-latest, macos-latest]
31-
scala: [3.3.0, 2.12.18, 2.13.10]
31+
scala: [3.3.0, 2.12.18, 2.13.11]
3232
java: [temurin@8, temurin@11, temurin@17, graalvm@11]
3333
ci: [ciJVM, ciNative, ciJS, ciFirefox, ciChrome]
3434
exclude:
@@ -252,7 +252,7 @@ jobs:
252252
- shell: bash
253253
run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'
254254

255-
- if: (matrix.scala == '2.13.10' || matrix.scala == '3.3.0') && matrix.ci == 'ciJVM'
255+
- if: (matrix.scala == '2.13.11' || matrix.scala == '3.3.0') && matrix.ci == 'ciJVM'
256256
shell: bash
257257
run: sbt '++ ${{ matrix.scala }}' docs/mdoc
258258

@@ -267,7 +267,7 @@ jobs:
267267
run: example/test-js.sh ${{ matrix.scala }}
268268

269269
- name: Test GraalVM Native Image
270-
if: matrix.scala == '2.13.10' && matrix.java == 'graalvm@11' && matrix.os == 'ubuntu-latest'
270+
if: matrix.scala == '2.13.11' && matrix.java == 'graalvm@11' && matrix.os == 'ubuntu-latest'
271271
shell: bash
272272
run: sbt '++ ${{ matrix.scala }}' graalVMExample/nativeImage graalVMExample/nativeImageRun
273273

@@ -277,7 +277,7 @@ jobs:
277277
run: example/test-native.sh ${{ matrix.scala }}
278278

279279
- name: Scalafix tests
280-
if: matrix.scala == '2.13.10' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
280+
if: matrix.scala == '2.13.11' && matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'
281281
shell: bash
282282
run: |
283283
cd scalafix
@@ -307,7 +307,7 @@ jobs:
307307
strategy:
308308
matrix:
309309
os: [ubuntu-latest]
310-
scala: [2.13.10]
310+
scala: [2.13.11]
311311
java: [temurin@8]
312312
runs-on: ${{ matrix.os }}
313313
steps:
@@ -468,52 +468,52 @@ jobs:
468468
tar xf targets.tar
469469
rm targets.tar
470470
471-
- name: Download target directories (2.13.10, ciJVM)
471+
- name: Download target directories (2.13.11, ciJVM)
472472
uses: actions/download-artifact@v3
473473
with:
474-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciJVM
474+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciJVM
475475

476-
- name: Inflate target directories (2.13.10, ciJVM)
476+
- name: Inflate target directories (2.13.11, ciJVM)
477477
run: |
478478
tar xf targets.tar
479479
rm targets.tar
480480
481-
- name: Download target directories (2.13.10, ciNative)
481+
- name: Download target directories (2.13.11, ciNative)
482482
uses: actions/download-artifact@v3
483483
with:
484-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciNative
484+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciNative
485485

486-
- name: Inflate target directories (2.13.10, ciNative)
486+
- name: Inflate target directories (2.13.11, ciNative)
487487
run: |
488488
tar xf targets.tar
489489
rm targets.tar
490490
491-
- name: Download target directories (2.13.10, ciJS)
491+
- name: Download target directories (2.13.11, ciJS)
492492
uses: actions/download-artifact@v3
493493
with:
494-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciJS
494+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciJS
495495

496-
- name: Inflate target directories (2.13.10, ciJS)
496+
- name: Inflate target directories (2.13.11, ciJS)
497497
run: |
498498
tar xf targets.tar
499499
rm targets.tar
500500
501-
- name: Download target directories (2.13.10, ciFirefox)
501+
- name: Download target directories (2.13.11, ciFirefox)
502502
uses: actions/download-artifact@v3
503503
with:
504-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciFirefox
504+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciFirefox
505505

506-
- name: Inflate target directories (2.13.10, ciFirefox)
506+
- name: Inflate target directories (2.13.11, ciFirefox)
507507
run: |
508508
tar xf targets.tar
509509
rm targets.tar
510510
511-
- name: Download target directories (2.13.10, ciChrome)
511+
- name: Download target directories (2.13.11, ciChrome)
512512
uses: actions/download-artifact@v3
513513
with:
514-
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-ciChrome
514+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-ciChrome
515515

516-
- name: Inflate target directories (2.13.10, ciChrome)
516+
- name: Inflate target directories (2.13.11, ciChrome)
517517
run: |
518518
tar xf targets.tar
519519
rm targets.tar
@@ -551,7 +551,7 @@ jobs:
551551
strategy:
552552
matrix:
553553
os: [ubuntu-latest]
554-
scala: [2.13.10]
554+
scala: [2.13.11]
555555
java: [temurin@8]
556556
runs-on: ${{ matrix.os }}
557557
steps:

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ val Windows = "windows-latest"
113113
val MacOS = "macos-latest"
114114

115115
val Scala212 = "2.12.18"
116-
val Scala213 = "2.13.10"
116+
val Scala213 = "2.13.11"
117117
val Scala3 = "3.3.0"
118118

119119
ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)

std/shared/src/main/scala/cats/effect/std/PQueue.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ object PQueue {
5959
assertNonNegative(capacity)
6060
F.ref(State.empty[F, A]).map { ref =>
6161
new PQueueImpl[F, A](ref, capacity) {
62-
implicit val Ord = O
62+
implicit val Ord: Order[A] = O
6363
}
6464
}
6565
}

std/shared/src/main/scala/cats/effect/std/internal/BinomialHeap.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private[std] object BinomialHeap {
6666

6767
def apply[A](trees: List[BinomialTree[A]])(implicit ord: Order[A]) =
6868
new BinomialHeap[A](trees) {
69-
implicit val Ord = ord
69+
implicit val Ord: Order[A] = ord
7070
}
7171

7272
/**

0 commit comments

Comments
 (0)