File tree Expand file tree Collapse file tree 2 files changed +4
-17
lines changed
compiler/test/dotty/tools/dotc Expand file tree Collapse file tree 2 files changed +4
-17
lines changed Original file line number Diff line number Diff line change @@ -250,7 +250,7 @@ class CompilationTests extends ParallelTesting {
250250 Array (" -Ycheck-reentrant" , " -Yemit-tasty-in-class" )
251251 )
252252
253- val libraryDirs = List (Paths .get(" library/src" ), Paths .get(" library/src-3.x " ), Paths .get( " library/src- bootstrapped" ))
253+ val libraryDirs = List (Paths .get(" library/src" ), Paths .get(" library/src-bootstrapped" ))
254254 val librarySources = libraryDirs.flatMap(sources(_))
255255
256256 val lib =
Original file line number Diff line number Diff line change @@ -708,28 +708,15 @@ object Build {
708708 // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
709709 scalacOptions in Compile ++= Seq (" -sourcepath" , (scalaSource in Compile ).value.getAbsolutePath),
710710
711- // To be removed once we stop cross-compiling with Scala 2
712- unmanagedSourceDirectories in Compile += {
713- val baseDir = baseDirectory.value
714- if (! isDotty.value)
715- baseDir / " src-2.x"
716- else
717- baseDir / " src-3.x"
718- },
719-
720711 // Add version-specific source directories:
721712 // - files in src-non-bootstrapped will only be compiled by the reference compiler
722713 // - files in src-bootstrapped will only be compiled by the current dotty compiler (non-bootstrapped and bootstrapped)
723714 unmanagedSourceDirectories in Compile ++= {
724715 val baseDir = baseDirectory.value
725- if (isDotty.value) {
726- if (scalaVersion.value == referenceVersion)
727- Seq (baseDir / " src-non-bootstrapped" )
728- else
729- Seq (baseDir / " src-bootstrapped" )
730- }
716+ if (scalaVersion.value == referenceVersion)
717+ Seq (baseDir / " src-non-bootstrapped" )
731718 else
732- Seq ()
719+ Seq (baseDir / " src-bootstrapped " )
733720 }
734721 )
735722
You can’t perform that action at this time.
0 commit comments