Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to 2.13.7 fixing incompats #157

Merged
merged 2 commits into from
Nov 19, 2021
Merged

Bump to 2.13.7 fixing incompats #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa67da2
Bump to 2.13.7 fixing incompats
som-snytt Nov 2, 2021
adc46f6
Another bump in the road
som-snytt Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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"),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

leftover from endless attempts to silence warnings.

testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),
Test / parallelExecution := false, // why?
libraryDependencies ++= Seq(
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/collection/MultiDict.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) && {
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/scala/collection/MultiSet.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) && {
Expand Down Expand Up @@ -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)