From fa67da2145eef5096977ffab7e73a2d622982fad Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 2 Nov 2021 12:57:20 -0700 Subject: [PATCH 1/2] Bump to 2.13.7 fixing incompats --- build.sbt | 6 +++--- src/main/scala/scala/collection/MultiDict.scala | 2 +- src/main/scala/scala/collection/MultiSet.scala | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 756fadd..6e321d9 100644 --- a/build.sbt +++ b/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( diff --git a/src/main/scala/scala/collection/MultiDict.scala b/src/main/scala/scala/collection/MultiDict.scala index b7e621c..9a0c74b 100644 --- a/src/main/scala/scala/collection/MultiDict.scala +++ b/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) && { diff --git a/src/main/scala/scala/collection/MultiSet.scala b/src/main/scala/scala/collection/MultiSet.scala index ba42d58..0465c8b 100644 --- a/src/main/scala/scala/collection/MultiSet.scala +++ b/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) \ No newline at end of file +object MultiSet extends IterableFactory.Delegate(immutable.MultiSet) From adc46f6e78f0dd91b5be622819fdd3a241afe63b Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 2 Nov 2021 14:14:30 -0700 Subject: [PATCH 2/2] Another bump in the road --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 598ba0a..97f89ac 100644 --- a/.github/workflows/ci.yml +++ b/.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