Skip to content

Turn off -Yscala2-unpickler for now #4883

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.

Sign up for GitHub

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 1 commit into from
Aug 1, 2018
Merged

Turn off -Yscala2-unpickler for now #4883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 compiler/test/dotty/tools/vulpix/TestConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ object TestConfiguration {
)

val checkOptions = Array(
"-Yscala2-unpickler", s"${Jars.scalaLibrary}:${Jars.scalaXml}",
// "-Yscala2-unpickler", s"${Jars.scalaLibrary}:${Jars.scalaXml}",
"-Yno-deep-subtypes",
"-Yno-double-bindings",
"-Yforce-sbt-phases",
Expand Down
4 changes: 4 additions & 0 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,13 @@ object Build {
scalacOptions ++= Seq("-bootclasspath", sys.props("sun.boot.class.path")),

// Enforce that the only Scala 2 classfiles we unpickle come from scala-library
/*
scalacOptions ++= {
val attList = (dependencyClasspath in `dotty-library` in Compile).value
val scalaLib = findLib(attList, "scala-library")
Seq("-Yscala2-unpickler", scalaLib)
},
*/

// sbt gets very unhappy if two projects use the same target
target := baseDirectory.value / ".." / "out" / "bootstrap" / name.value,
Expand Down Expand Up @@ -785,6 +787,7 @@ object Build {
lazy val `dotty-sbt-bridge-bootstrapped` = project.in(file("sbt-bridge")).asDottySbtBridge(Bootstrapped)
.settings(
// Tweak -Yscala2-unpickler to allow some sbt dependencies used in tests
/*
scalacOptions in Test := {
val oldOptions = (scalacOptions in Test).value
val i = oldOptions.indexOf("-Yscala2-unpickler")
Expand All @@ -797,6 +800,7 @@ object Build {

oldOptions.updated(i + 1, s"$sbtIo:$zincApiInfo:$oldValue")
}
*/
)

lazy val `dotty-language-server` = project.in(file("language-server")).
Expand Down