Skip to content

Commit 14dd768

Browse files
authored
Merge pull request #327 from SethTisue/rename-library
rename to scala-library-compat
2 parents 48c03f9 + 6153aad commit 14dd768

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
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-collection-compat/issues](https://github.com/scala/scala-collection-compat/issues).
17+
Create an issue [scala-library-compat/issues](https://github.com/scala/scala-library-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-collection-compat
1+
scala-library-compat
22
Copyright (c) 2002-2020 EPFL
33
Copyright (c) 2011-2020 Lightbend, Inc.
44

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,5 @@ import scalafix.sbt.ScalafixPlugin.autoImport.{scalafixDependencies, scalafixSem
9292

9393
### Contributing
9494

95-
The migration tool is not exhaustive and we will continue to improve
96-
it over time. If you encounter a use case that’s not supported, please
97-
report it as described in the
98-
[contributing documentation](CONTRIBUTING.md#migration-tool).
95+
The migration tool is not exhaustive. Contributions of additional rewrites are welcome. If you encounter a use case that’s not supported, please report it as described in the [contributing
96+
documentation](CONTRIBUTING.md#migration-tool).

build.sbt

+23-18
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ lazy val commonSettings = Seq(
1414
|See the NOTICE file distributed with this work for
1515
|additional information regarding copyright ownership.
1616
|""".stripMargin)),
17-
scalaModuleMimaPreviousVersion := Some("2.1.4")
17+
scalaModuleMimaPreviousVersion := None // TODO: change to `Some("3.0.0") once we publish
1818
)
1919

2020
lazy val root = project
2121
.in(file("."))
2222
.settings(commonSettings)
23-
.settings(name := "scala-collection-compat")
23+
.settings(name := "scala-library-compat")
2424
.settings(dontPublish)
2525
.aggregate(
2626
compat211JVM,
@@ -56,8 +56,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
5656
_.settings(scalaModuleSettings)
5757
.settings(commonSettings)
5858
.settings(
59-
name := "scala-collection-compat",
60-
moduleName := "scala-collection-compat",
59+
name := "scala-library-compat",
60+
moduleName := "scala-library-compat",
6161
scalacOptions ++= Seq("-feature", "-language:higherKinds", "-language:implicitConversions"),
6262
unmanagedSourceDirectories in Compile += {
6363
val sharedSourceDir = (baseDirectory in ThisBuild).value / "compat/src/main"
@@ -72,7 +72,7 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
7272
.jsSettings(
7373
scalacOptions += {
7474
val x = (baseDirectory in LocalRootProject).value.toURI.toString
75-
val y = "https://raw.githubusercontent.com/scala/scala-collection-compat/" + sys.process
75+
val y = "https://raw.githubusercontent.com/scala/scala-library-compat/" + sys.process
7676
.Process("git rev-parse HEAD")
7777
.lineStream_!
7878
.head
@@ -188,12 +188,14 @@ lazy val `scalafix-input` = project
188188
)
189189
.dependsOn(`scalafix-data212`)
190190

191-
val `scalafix-output` = MultiScalaProject("scalafix-output",
192-
"scalafix/output",
193-
_.settings(sharedScalafixSettings)
194-
.settings(commonSettings)
195-
.settings(dontPublish)
196-
.disablePlugins(ScalafixPlugin))
191+
val `scalafix-output` = MultiScalaProject(
192+
"scalafix-output",
193+
"scalafix/output",
194+
_.settings(sharedScalafixSettings)
195+
.settings(commonSettings)
196+
.settings(dontPublish)
197+
.disablePlugins(ScalafixPlugin)
198+
)
197199

198200
lazy val outputCross =
199201
Def.setting((baseDirectory in ThisBuild).value / "scalafix/output/src/main/scala")
@@ -243,10 +245,12 @@ lazy val `scalafix-tests` = project
243245
.settings(
244246
scalaVersion := scalafixScala212,
245247
libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % scalafixVersion % Test cross CrossVersion.full,
246-
scalafixTestkitOutputSourceDirectories := Seq(outputCross.value,
247-
output212.value,
248-
output212Plus.value,
249-
output213.value),
248+
scalafixTestkitOutputSourceDirectories := Seq(
249+
outputCross.value,
250+
output212.value,
251+
output212Plus.value,
252+
output213.value
253+
),
250254
scalafixTestkitInputSourceDirectories := sourceDirectories.in(`scalafix-input`, Compile).value,
251255
scalafixTestkitInputClasspath := fullClasspath.in(`scalafix-input`, Compile).value
252256
)
@@ -258,7 +262,7 @@ lazy val dontPublish = Seq(
258262
packagedArtifacts := Map.empty,
259263
publish := {},
260264
publishLocal := {},
261-
scalaModuleMimaPreviousVersion := None,
265+
scalaModuleMimaPreviousVersion := None
262266
)
263267

264268
val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
@@ -333,7 +337,7 @@ inThisBuild(
333337
s"$projectPrefix/publishSigned",
334338
"sonatypePrepare",
335339
"sonatypeBundleUpload",
336-
"sonatypeClose",
340+
"sonatypeClose"
337341
)
338342
} else {
339343
Nil
@@ -355,4 +359,5 @@ inThisBuild(
355359
val newCommands = toRun.toList.map(Exec(_, None))
356360
state.copy(remainingCommands = newCommands ::: state.remainingCommands)
357361
}
358-
))
362+
)
363+
)

0 commit comments

Comments
 (0)