Skip to content

sigh, rename back to scala-collection-compat (and re-enable MiMa) #356

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.

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

Merged
merged 2 commits into from
Sep 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Several levels of contribution are possible!

### Report a missing case

Create an issue [scala-library-compat/issues](https://github.com/scala/scala-library-compat/issues).
Create an issue [scala-collection-compat/issues](https://github.com/scala/scala-collection-compat/issues).
Embrace `diff`s to describe differences between the standard collections and
the new collection:

Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scala-library-compat
scala-collection-compat
Copyright (c) 2002-2020 EPFL
Copyright (c) 2011-2020 Lightbend, Inc.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/scala/scala-library-compat.svg?branch=master)](https://travis-ci.org/scala/scala-library-compat)
[![Build Status](https://travis-ci.org/scala/scala-collection-compat.svg?branch=master)](https://travis-ci.org/scala/scala-collection-compat)

# Scala 2.13 Collection Compatibility Library And Migration Tool

Expand Down
17 changes: 12 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,20 @@ lazy val commonSettings = Seq(
|See the NOTICE file distributed with this work for
|additional information regarding copyright ownership.
|""".stripMargin)),
scalaModuleMimaPreviousVersion := None // TODO: change to `Some("3.0.0") once we publish
scalaModuleMimaPreviousVersion := Some("2.1.6"),
mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core._
import com.typesafe.tools.mima.core.ProblemFilters._
Seq(
exclude[ReversedMissingMethodProblem]("scala.collection.compat.PackageShared.*"), // it's package-private
)
}
)

lazy val root = project
.in(file("."))
.settings(commonSettings)
.settings(name := "scala-library-compat")
.settings(name := "scala-collection-compat")
.settings(dontPublish)
.aggregate(
compat211JVM,
Expand Down Expand Up @@ -56,8 +63,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
_.settings(scalaModuleSettings)
.settings(commonSettings)
.settings(
name := "scala-library-compat",
moduleName := "scala-library-compat",
name := "scala-collection-compat",
moduleName := "scala-collection-compat",
scalacOptions ++= Seq("-feature", "-language:higherKinds", "-language:implicitConversions"),
unmanagedSourceDirectories in Compile += {
val sharedSourceDir = (baseDirectory in ThisBuild).value / "compat/src/main"
Expand All @@ -72,7 +79,7 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
.jsSettings(
scalacOptions += {
val x = (baseDirectory in LocalRootProject).value.toURI.toString
val y = "https://raw.githubusercontent.com/scala/scala-library-compat/" + sys.process
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
.Process("git rev-parse HEAD")
.lineStream_!
.head
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private[compat] trait PackageShared {

implicit def genericCompanionToCBF[A, CC[X] <: GenTraversable[X]](
fact: GenericCompanion[CC]): CanBuildFrom[Any, A, CC[A]] = {
/* see https://github.com/scala/scala-library-compat/issues/337
/* see https://github.com/scala/scala-collection-compat/issues/337
`simpleCBF.apply` takes a by-name parameter and relies on
repeated references generating new builders, thus this expression
must be non-strict
Expand Down Expand Up @@ -462,4 +462,4 @@ class ImmutableQueueExtensionMethods[A](private val self: i.Queue[A]) extends An
class MutableQueueExtensionMethods[Element](private val self: m.Queue[Element]) extends AnyVal {
def enqueueAll(iter: c.Iterable[Element]): Unit =
self.enqueue(iter.toIndexedSeq: _*)
}
}