Skip to content

rename to scala-library-compat #327

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
Apr 30, 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-collection-compat/issues](https://github.com/scala/scala-collection-compat/issues).
Create an issue [scala-library-compat/issues](https://github.com/scala/scala-library-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-collection-compat
scala-library-compat
Copyright (c) 2002-2020 EPFL
Copyright (c) 2011-2020 Lightbend, Inc.

Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,5 @@ import scalafix.sbt.ScalafixPlugin.autoImport.{scalafixDependencies, scalafixSem

### Contributing

The migration tool is not exhaustive and we will continue to improve
it over time. If you encounter a use case that’s not supported, please
report it as described in the
[contributing documentation](CONTRIBUTING.md#migration-tool).
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
documentation](CONTRIBUTING.md#migration-tool).
41 changes: 23 additions & 18 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ lazy val commonSettings = Seq(
|See the NOTICE file distributed with this work for
|additional information regarding copyright ownership.
|""".stripMargin)),
scalaModuleMimaPreviousVersion := Some("2.1.4")
scalaModuleMimaPreviousVersion := None // TODO: change to `Some("3.0.0") once we publish
)

lazy val root = project
.in(file("."))
.settings(commonSettings)
.settings(name := "scala-collection-compat")
.settings(name := "scala-library-compat")
.settings(dontPublish)
.aggregate(
compat211JVM,
Expand Down Expand Up @@ -56,8 +56,8 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
_.settings(scalaModuleSettings)
.settings(commonSettings)
.settings(
name := "scala-collection-compat",
moduleName := "scala-collection-compat",
name := "scala-library-compat",
moduleName := "scala-library-compat",
scalacOptions ++= Seq("-feature", "-language:higherKinds", "-language:implicitConversions"),
unmanagedSourceDirectories in Compile += {
val sharedSourceDir = (baseDirectory in ThisBuild).value / "compat/src/main"
Expand All @@ -72,7 +72,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-collection-compat/" + sys.process
val y = "https://raw.githubusercontent.com/scala/scala-library-compat/" + sys.process
.Process("git rev-parse HEAD")
.lineStream_!
.head
Expand Down Expand Up @@ -188,12 +188,14 @@ lazy val `scalafix-input` = project
)
.dependsOn(`scalafix-data212`)

val `scalafix-output` = MultiScalaProject("scalafix-output",
"scalafix/output",
_.settings(sharedScalafixSettings)
.settings(commonSettings)
.settings(dontPublish)
.disablePlugins(ScalafixPlugin))
val `scalafix-output` = MultiScalaProject(
"scalafix-output",
"scalafix/output",
_.settings(sharedScalafixSettings)
.settings(commonSettings)
.settings(dontPublish)
.disablePlugins(ScalafixPlugin)
)

lazy val outputCross =
Def.setting((baseDirectory in ThisBuild).value / "scalafix/output/src/main/scala")
Expand Down Expand Up @@ -243,10 +245,12 @@ lazy val `scalafix-tests` = project
.settings(
scalaVersion := scalafixScala212,
libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % scalafixVersion % Test cross CrossVersion.full,
scalafixTestkitOutputSourceDirectories := Seq(outputCross.value,
output212.value,
output212Plus.value,
output213.value),
scalafixTestkitOutputSourceDirectories := Seq(
outputCross.value,
output212.value,
output212Plus.value,
output213.value
),
scalafixTestkitInputSourceDirectories := sourceDirectories.in(`scalafix-input`, Compile).value,
scalafixTestkitInputClasspath := fullClasspath.in(`scalafix-input`, Compile).value
)
Expand All @@ -258,7 +262,7 @@ lazy val dontPublish = Seq(
packagedArtifacts := Map.empty,
publish := {},
publishLocal := {},
scalaModuleMimaPreviousVersion := None,
scalaModuleMimaPreviousVersion := None
)

val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse)
Expand Down Expand Up @@ -333,7 +337,7 @@ inThisBuild(
s"$projectPrefix/publishSigned",
"sonatypePrepare",
"sonatypeBundleUpload",
"sonatypeClose",
"sonatypeClose"
)
} else {
Nil
Expand All @@ -355,4 +359,5 @@ inThisBuild(
val newCommands = toRun.toList.map(Exec(_, None))
state.copy(remainingCommands = newCommands ::: state.remainingCommands)
}
))
)
)