Merge pull request #157 from som-snytt/issue/upgrade

Bump to 2.13.7 fixing incompats

Author: SethTisue

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [8, 11, 17]
-        scala: [2.13.6]
+        scala: [2.13.7]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

build.sbt

@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.13.6"
+ThisBuild / scalaVersion := "2.13.7"
 
 lazy val root = project.in(file("."))
   .aggregate(collectionContrib.jvm, collectionContrib.js)
@@ -17,8 +17,8 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
     name := "scala-collection-contrib",
     versionPolicyIntention := Compatibility.BinaryCompatible,
     scalaModuleAutomaticModuleName := Some("scala.collection.contrib"),
-    scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings"),
-    Compile / doc / scalacOptions ++= Seq("-implicits", "-groups"),
+    Compile / compile / scalacOptions ++= Seq("-opt-warnings", "-language:higherKinds", "-deprecation", "-feature", "-Xfatal-warnings", "-Wconf:origin=scala.collection.IterableOps.toIterable:s"),
+    Compile / doc / scalacOptions ++= Seq("-implicits", "-groups", "-nowarn"),
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),
     Test / parallelExecution := false,  // why?
     libraryDependencies ++= Seq(

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

@@ -24,7 +24,7 @@ trait MultiDict[K, V]
   def canEqual(that: Any): Boolean = true
 
   override def equals(o: Any): Boolean = o match {
-    case that: MultiDict[K, V] =>
+    case that: MultiDict[K @unchecked, _] =>
       (this eq that) ||
         (that canEqual this) &&
           (this.size == that.size) && {

src/main/scala/scala/collection/MultiSet.scala

@@ -22,7 +22,7 @@ trait MultiSet[A]
   def canEqual(that: Any): Boolean = true
 
   override def equals(o: Any): Boolean = o match {
-    case that: MultiSet[A] =>
+    case that: MultiSet[A @unchecked] =>
       (this eq that) ||
         (that canEqual this) &&
           (this.size == that.size) && {
@@ -126,4 +126,4 @@ trait MultiSetOps[A, +CC[X] <: MultiSet[X], +C <: MultiSet[A]]
 
 }
 
-object MultiSet extends IterableFactory.Delegate(immutable.MultiSet)
+object MultiSet extends IterableFactory.Delegate(immutable.MultiSet)