File tree Expand file tree Collapse file tree 2 files changed +5
-1
lines changed
compiler/test/dotty/tools/vulpix Expand file tree Collapse file tree 2 files changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ object TestConfiguration {
1010 )
1111
1212 val checkOptions = Array (
13- " -Yscala2-unpickler" , s " ${Jars .scalaLibrary}: ${Jars .scalaXml}" ,
13+ // "-Yscala2-unpickler", s"${Jars.scalaLibrary}:${Jars.scalaXml}",
1414 " -Yno-deep-subtypes" ,
1515 " -Yno-double-bindings" ,
1616 " -Yforce-sbt-phases" ,
Original file line number Diff line number Diff line change @@ -228,11 +228,13 @@ object Build {
228228 scalacOptions ++= Seq (" -bootclasspath" , sys.props(" sun.boot.class.path" )),
229229
230230 // Enforce that the only Scala 2 classfiles we unpickle come from scala-library
231+ /*
231232 scalacOptions ++= {
232233 val attList = (dependencyClasspath in `dotty-library` in Compile).value
233234 val scalaLib = findLib(attList, "scala-library")
234235 Seq("-Yscala2-unpickler", scalaLib)
235236 },
237+ */
236238
237239 // sbt gets very unhappy if two projects use the same target
238240 target := baseDirectory.value / " .." / " out" / " bootstrap" / name.value,
@@ -785,6 +787,7 @@ object Build {
785787 lazy val `dotty-sbt-bridge-bootstrapped` = project.in(file(" sbt-bridge" )).asDottySbtBridge(Bootstrapped )
786788 .settings(
787789 // Tweak -Yscala2-unpickler to allow some sbt dependencies used in tests
790+ /*
788791 scalacOptions in Test := {
789792 val oldOptions = (scalacOptions in Test).value
790793 val i = oldOptions.indexOf("-Yscala2-unpickler")
@@ -797,6 +800,7 @@ object Build {
797800
798801 oldOptions.updated(i + 1, s"$sbtIo:$zincApiInfo:$oldValue")
799802 }
803+ */
800804 )
801805
802806 lazy val `dotty-language-server` = project.in(file(" language-server" )).
You can’t perform that action at this time.
0 commit comments