From 397173d0b35111f13ff7e7237102f31780ee805b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 20 Jul 2022 10:08:38 -0700 Subject: [PATCH] Scala 2.13.10 (was .8), Scala 3.2.1 (was .1.3) includes a small tweak necessary in order to adapt to https://github.com/scala/scala/pull/10047 this originally came up at https://github.com/scala/community-build/pull/1579 --- build.sbt | 4 ++-- src/main/scala/scala/collection/MultiDict.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 07150cd..9bc6383 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ -ThisBuild / scalaVersion := "3.1.3" -ThisBuild / crossScalaVersions := Seq((ThisBuild / scalaVersion).value, "2.13.8") +ThisBuild / scalaVersion := "3.2.1" +ThisBuild / crossScalaVersions := Seq((ThisBuild / scalaVersion).value, "2.13.10") lazy val root = project.in(file(".")) .aggregate(collectionContrib.jvm, collectionContrib.js, collectionContrib.native) diff --git a/src/main/scala/scala/collection/MultiDict.scala b/src/main/scala/scala/collection/MultiDict.scala index 9a0c74b..29cf304 100644 --- a/src/main/scala/scala/collection/MultiDict.scala +++ b/src/main/scala/scala/collection/MultiDict.scala @@ -198,7 +198,7 @@ trait MultiDictOps[K, V, +CC[X, Y] <: MultiDict[X, Y], +C <: MultiDict[K, V]] def filterSets(p: ((K, Set[V])) => Boolean): C = fromSpecificSets(new View.Filter(sets, p, isFlipped = false)) - override def addString(sb: StringBuilder, start: String, sep: String, end: String): StringBuilder = + override def addString(sb: StringBuilder, start: String, sep: String, end: String): sb.type = iterator.map { case (k, v) => s"$k -> $v" }.addString(sb, start, sep, end) }