diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f20f0b47..e21ef57f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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: diff --git a/NOTICE b/NOTICE index 18eab947..e7ef493d 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -scala-library-compat +scala-collection-compat Copyright (c) 2002-2020 EPFL Copyright (c) 2011-2020 Lightbend, Inc. diff --git a/README.md b/README.md index 9b54cd16..68320e7c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/build.sbt b/build.sbt index 5e35a778..ce832649 100644 --- a/build.sbt +++ b/build.sbt @@ -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, @@ -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" @@ -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 diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala index 448ef1d8..2bd2eff6 100644 --- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala +++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala @@ -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 @@ -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: _*) -} \ No newline at end of file +}