scala · nicolasstucki · Jul 8, 2019 · Jul 8, 2019 · Jul 8, 2019 · Jul 8, 2019
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -250,7 +250,7 @@ class CompilationTests extends ParallelTesting {
       Array("-Ycheck-reentrant", "-Yemit-tasty-in-class")
     )
 
-    val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-3.x"), Paths.get("library/src-bootstrapped"))
+    val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped"))
     val librarySources = libraryDirs.flatMap(sources(_))
 
     val lib =

diff --git a/library/src-3.x/scala/IArray.scala → library/src-bootstrapped/scala/IArray.scala b/library/src-3.x/scala/IArray.scala → library/src-bootstrapped/scala/IArray.scala
diff --git a/library/src-3.x/dotty/DottyPredef.scala → library/src/dotty/DottyPredef.scala b/library/src-3.x/dotty/DottyPredef.scala → library/src/dotty/DottyPredef.scala
diff --git a/library/src-3.x/scala/Tuple.scala → library/src/scala/Tuple.scala b/library/src-3.x/scala/Tuple.scala → library/src/scala/Tuple.scala
diff --git a/library/src-3.x/scala/TupledFunction.scala → library/src/scala/TupledFunction.scala b/library/src-3.x/scala/TupledFunction.scala → library/src/scala/TupledFunction.scala
diff --git a/...ary/src-3.x/scala/compiletime/Shape.scala → library/src/scala/compiletime/Shape.scala b/...ary/src-3.x/scala/compiletime/Shape.scala → library/src/scala/compiletime/Shape.scala
diff --git a/...y/src-3.x/scala/compiletime/package.scala → library/src/scala/compiletime/package.scala b/...y/src-3.x/scala/compiletime/package.scala → library/src/scala/compiletime/package.scala
diff --git a/library/src-3.x/scala/deriving.scala → library/src/scala/deriving.scala b/library/src-3.x/scala/deriving.scala → library/src/scala/deriving.scala
diff --git a/library/src-3.x/scala/internal/Quoted.scala → library/src/scala/internal/Quoted.scala b/library/src-3.x/scala/internal/Quoted.scala → library/src/scala/internal/Quoted.scala
diff --git a/...y/src-3.x/scala/internal/WithBounds.scala → library/src/scala/internal/WithBounds.scala b/...y/src-3.x/scala/internal/WithBounds.scala → library/src/scala/internal/WithBounds.scala
diff --git a/library/src-3.x/scala/quoted/Expr.scala → library/src/scala/quoted/Expr.scala b/library/src-3.x/scala/quoted/Expr.scala → library/src/scala/quoted/Expr.scala
diff --git a/library/src-3.x/scala/quoted/Liftable.scala → library/src/scala/quoted/Liftable.scala b/library/src-3.x/scala/quoted/Liftable.scala → library/src/scala/quoted/Liftable.scala
diff --git a/library/src-3.x/scala/quoted/Type.scala → library/src/scala/quoted/Type.scala b/library/src-3.x/scala/quoted/Type.scala → library/src/scala/quoted/Type.scala
diff --git a/.../src-3.x/scala/quoted/matching/Bind.scala → library/src/scala/quoted/matching/Bind.scala b/.../src-3.x/scala/quoted/matching/Bind.scala → library/src/scala/quoted/matching/Bind.scala
diff --git a/...src-3.x/scala/quoted/matching/Const.scala → ...ary/src/scala/quoted/matching/Const.scala b/...src-3.x/scala/quoted/matching/Const.scala → ...ary/src/scala/quoted/matching/Const.scala
diff --git a/...-3.x/scala/quoted/matching/ConstSeq.scala → .../src/scala/quoted/matching/ConstSeq.scala b/...-3.x/scala/quoted/matching/ConstSeq.scala → .../src/scala/quoted/matching/ConstSeq.scala
diff --git a/...c-3.x/scala/quoted/matching/ExprSeq.scala → ...y/src/scala/quoted/matching/ExprSeq.scala b/...c-3.x/scala/quoted/matching/ExprSeq.scala → ...y/src/scala/quoted/matching/ExprSeq.scala
diff --git a/.../src-3.x/scala/runtime/DynamicTuple.scala → library/src/scala/runtime/DynamicTuple.scala b/.../src-3.x/scala/runtime/DynamicTuple.scala → library/src/scala/runtime/DynamicTuple.scala
diff --git a/...c-3.x/scala/tasty/reflect/QuotedOps.scala → ...y/src/scala/tasty/reflect/QuotedOps.scala b/...c-3.x/scala/tasty/reflect/QuotedOps.scala → ...y/src/scala/tasty/reflect/QuotedOps.scala
diff --git a/...scala/tasty/reflect/utils/TreeUtils.scala → ...scala/tasty/reflect/utils/TreeUtils.scala b/...scala/tasty/reflect/utils/TreeUtils.scala → ...scala/tasty/reflect/utils/TreeUtils.scala
diff --git a/.../scala/util/control/NonLocalReturns.scala → .../scala/util/control/NonLocalReturns.scala b/.../scala/util/control/NonLocalReturns.scala → .../scala/util/control/NonLocalReturns.scala
diff --git a/project/Build.scala b/project/Build.scala
@@ -708,28 +708,15 @@ object Build {
     // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
     scalacOptions in Compile ++= Seq("-sourcepath", (scalaSource in Compile).value.getAbsolutePath),
 
-    // To be removed once we stop cross-compiling with Scala 2
-    unmanagedSourceDirectories in Compile += {
-      val baseDir = baseDirectory.value
-      if (!isDotty.value)
-        baseDir / "src-2.x"
-      else
-        baseDir / "src-3.x"
-    },
-
     // Add version-specific source directories:
     // - files in src-non-bootstrapped will only be compiled by the reference compiler
     // - files in src-bootstrapped will only be compiled by the current dotty compiler (non-bootstrapped and bootstrapped)
     unmanagedSourceDirectories in Compile ++= {
       val baseDir = baseDirectory.value
-      if (isDotty.value) {
-        if (scalaVersion.value == referenceVersion)
-          Seq(baseDir / "src-non-bootstrapped")
-        else
-          Seq(baseDir / "src-bootstrapped")
-      }
+      if (scalaVersion.value == referenceVersion)
+        Seq(baseDir / "src-non-bootstrapped")
       else
-        Seq()
+        Seq(baseDir / "src-bootstrapped")
     }
   )