Skip to content

Commit 4edc530

Browse files
committed
Scala 2.13.10 (was 2.13.8)
includes a small tweak necessary in order to adapt to scala/scala#10047 this originally came up at scala/community-build#1579
1 parent 0cd1694 commit 4edc530

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
java: [8, 11, 17]
13-
scala: [2.13.8, 3.1.3]
13+
scala: [2.13.x, 3.x]
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ThisBuild / scalaVersion := "3.1.3"
2-
ThisBuild / crossScalaVersions := Seq((ThisBuild / scalaVersion).value, "2.13.8")
2+
ThisBuild / crossScalaVersions := Seq((ThisBuild / scalaVersion).value, "2.13.10")
33

44
lazy val root = project.in(file("."))
55
.aggregate(collectionContrib.jvm, collectionContrib.js)

src/main/scala/scala/collection/MultiDict.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ trait MultiDictOps[K, V, +CC[X, Y] <: MultiDict[X, Y], +C <: MultiDict[K, V]]
198198
def filterSets(p: ((K, Set[V])) => Boolean): C =
199199
fromSpecificSets(new View.Filter(sets, p, isFlipped = false))
200200

201-
override def addString(sb: StringBuilder, start: String, sep: String, end: String): StringBuilder =
201+
override def addString(sb: StringBuilder, start: String, sep: String, end: String): sb.type =
202202
iterator.map { case (k, v) => s"$k -> $v" }.addString(sb, start, sep, end)
203203
}
204204

0 commit comments

Comments
 (0)