Skip to content

Commit 167833d

Browse files
authored
Merge pull request #356 from SethTisue/unrename
sigh, rename back to scala-collection-compat (and re-enable MiMa)
2 parents c4ef98e + 0d1ca5e commit 167833d

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Several levels of contribution are possible!
1414

1515
### Report a missing case
1616

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

NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scala-library-compat
1+
scala-collection-compat
22
Copyright (c) 2002-2020 EPFL
33
Copyright (c) 2011-2020 Lightbend, Inc.
44

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/scala/scala-library-compat.svg?branch=master)](https://travis-ci.org/scala/scala-library-compat)
1+
[![Build Status](https://travis-ci.org/scala/scala-collection-compat.svg?branch=master)](https://travis-ci.org/scala/scala-collection-compat)
22

33
# Scala 2.13 Collection Compatibility Library And Migration Tool
44

build.sbt

+12-5
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@ lazy val commonSettings = Seq(
1414
|See the NOTICE file distributed with this work for
1515
|additional information regarding copyright ownership.
1616
|""".stripMargin)),
17-
scalaModuleMimaPreviousVersion := None // TODO: change to `Some("3.0.0") once we publish
17+
scalaModuleMimaPreviousVersion := Some("2.1.6"),
18+
mimaBinaryIssueFilters ++= {
19+
import com.typesafe.tools.mima.core._
20+
import com.typesafe.tools.mima.core.ProblemFilters._
21+
Seq(
22+
exclude[ReversedMissingMethodProblem]("scala.collection.compat.PackageShared.*"), // it's package-private
23+
)
24+
}
1825
)
1926

2027
lazy val root = project
2128
.in(file("."))
2229
.settings(commonSettings)
23-
.settings(name := "scala-library-compat")
30+
.settings(name := "scala-collection-compat")
2431
.settings(dontPublish)
2532
.aggregate(
2633
compat211JVM,
@@ -56,8 +63,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
5663
_.settings(scalaModuleSettings)
5764
.settings(commonSettings)
5865
.settings(
59-
name := "scala-library-compat",
60-
moduleName := "scala-library-compat",
66+
name := "scala-collection-compat",
67+
moduleName := "scala-collection-compat",
6168
scalacOptions ++= Seq("-feature", "-language:higherKinds", "-language:implicitConversions"),
6269
unmanagedSourceDirectories in Compile += {
6370
val sharedSourceDir = (baseDirectory in ThisBuild).value / "compat/src/main"
@@ -72,7 +79,7 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
7279
.jsSettings(
7380
scalacOptions += {
7481
val x = (baseDirectory in LocalRootProject).value.toURI.toString
75-
val y = "https://raw.githubusercontent.com/scala/scala-library-compat/" + sys.process
82+
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
7683
.Process("git rev-parse HEAD")
7784
.lineStream_!
7885
.head

compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private[compat] trait PackageShared {
5555

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

0 commit comments

Comments
 (0)