scala
diff --git a/‎library/src-3.x/dotty/DottyPredef.scala renamed to ‎library/src/dotty/DottyPredef.scala b/‎library/src-3.x/dotty/DottyPredef.scala renamed to ‎library/src/dotty/DottyPredef.scala
diff --git a/‎library/src-3.x/dotty/internal/StringContextMacro.scala renamed to ‎library/src/dotty/internal/StringContextMacro.scala b/‎library/src-3.x/dotty/internal/StringContextMacro.scala renamed to ‎library/src/dotty/internal/StringContextMacro.scala
diff --git a/‎library/src-3.x/scala/IArray.scala renamed to ‎library/src/scala/IArray.scala b/‎library/src-3.x/scala/IArray.scala renamed to ‎library/src/scala/IArray.scala
diff --git a/‎library/src-3.x/scala/Tuple.scala renamed to ‎library/src/scala/Tuple.scala b/‎library/src-3.x/scala/Tuple.scala renamed to ‎library/src/scala/Tuple.scala
diff --git a/‎library/src-3.x/scala/TupledFunction.scala renamed to ‎library/src/scala/TupledFunction.scala b/‎library/src-3.x/scala/TupledFunction.scala renamed to ‎library/src/scala/TupledFunction.scala
diff --git a/‎library/src-3.x/scala/compiletime/Shape.scala renamed to ‎library/src/scala/compiletime/Shape.scala b/‎library/src-3.x/scala/compiletime/Shape.scala renamed to ‎library/src/scala/compiletime/Shape.scala
diff --git a/‎library/src-3.x/scala/compiletime/package.scala renamed to ‎library/src/scala/compiletime/package.scala b/‎library/src-3.x/scala/compiletime/package.scala renamed to ‎library/src/scala/compiletime/package.scala
diff --git a/‎library/src-3.x/scala/deriving.scala renamed to ‎library/src/scala/deriving.scala b/‎library/src-3.x/scala/deriving.scala renamed to ‎library/src/scala/deriving.scala
diff --git a/‎library/src-3.x/scala/internal/Quoted.scala renamed to ‎library/src/scala/internal/Quoted.scala b/‎library/src-3.x/scala/internal/Quoted.scala renamed to ‎library/src/scala/internal/Quoted.scala
diff --git a/‎library/src-3.x/scala/internal/WithBounds.scala renamed to ‎library/src/scala/internal/WithBounds.scala b/‎library/src-3.x/scala/internal/WithBounds.scala renamed to ‎library/src/scala/internal/WithBounds.scala
diff --git a/‎library/src-3.x/scala/internal/quoted/Matcher.scala renamed to ‎library/src/scala/internal/quoted b/‎library/src-3.x/scala/internal/quoted/Matcher.scala renamed to ‎library/src/scala/internal/quoted
diff --git a/‎library/src-3.x/scala/quoted/Expr.scala renamed to ‎library/src/scala/quoted/Expr.scala b/‎library/src-3.x/scala/quoted/Expr.scala renamed to ‎library/src/scala/quoted/Expr.scala
diff --git a/‎library/src-3.x/scala/quoted/Liftable.scala renamed to ‎library/src/scala/quoted/Liftable.scala b/‎library/src-3.x/scala/quoted/Liftable.scala renamed to ‎library/src/scala/quoted/Liftable.scala
diff --git a/‎library/src-3.x/scala/quoted/Type.scala renamed to ‎library/src/scala/quoted/Type.scala b/‎library/src-3.x/scala/quoted/Type.scala renamed to ‎library/src/scala/quoted/Type.scala
diff --git a/‎library/src-3.x/scala/quoted/matching/Bind.scala renamed to ‎library/src/scala/quoted/matching/Bind.scala b/‎library/src-3.x/scala/quoted/matching/Bind.scala renamed to ‎library/src/scala/quoted/matching/Bind.scala
diff --git a/‎library/src-3.x/scala/quoted/matching/Const.scala renamed to ‎library/src/scala/quoted/matching/Const.scala b/‎library/src-3.x/scala/quoted/matching/Const.scala renamed to ‎library/src/scala/quoted/matching/Const.scala
diff --git a/‎library/src-3.x/scala/quoted/matching/ConstSeq.scala renamed to ‎library/src/scala/quoted/matching/ConstSeq.scala b/‎library/src-3.x/scala/quoted/matching/ConstSeq.scala renamed to ‎library/src/scala/quoted/matching/ConstSeq.scala
diff --git a/‎library/src-3.x/scala/quoted/matching/ExprSeq.scala renamed to ‎library/src/scala/quoted/matching/ExprSeq.scala b/‎library/src-3.x/scala/quoted/matching/ExprSeq.scala renamed to ‎library/src/scala/quoted/matching/ExprSeq.scala
diff --git a/‎library/src-3.x/scala/quoted/package.scala renamed to ‎library/src/scala/quoted/package.scala b/‎library/src-3.x/scala/quoted/package.scala renamed to ‎library/src/scala/quoted/package.scala
diff --git a/‎library/src-3.x/scala/runtime/DynamicTuple.scala renamed to ‎library/src/scala/runtime/DynamicTuple.scala b/‎library/src-3.x/scala/runtime/DynamicTuple.scala renamed to ‎library/src/scala/runtime/DynamicTuple.scala
diff --git a/‎library/src-3.x/scala/tasty/reflect/QuotedOps.scala renamed to ‎library/src/scala/tasty/reflect/QuotedOps.scala b/‎library/src-3.x/scala/tasty/reflect/QuotedOps.scala renamed to ‎library/src/scala/tasty/reflect/QuotedOps.scala
diff --git a/‎library/src-3.x/scala/tasty/reflect/utils/TreeUtils.scala renamed to ‎library/src/scala/tasty/reflect/utils/TreeUtils.scala b/‎library/src-3.x/scala/tasty/reflect/utils/TreeUtils.scala renamed to ‎library/src/scala/tasty/reflect/utils/TreeUtils.scala
diff --git a/‎library/src-3.x/scala/testing/typeChecks.scala renamed to ‎library/src/scala/testing/typeChecks.scala b/‎library/src-3.x/scala/testing/typeChecks.scala renamed to ‎library/src/scala/testing/typeChecks.scala
diff --git a/‎library/src-3.x/scala/util/control/NonLocalReturns.scala renamed to ‎library/src/scala/util/control/NonLocalReturns.scala b/‎library/src-3.x/scala/util/control/NonLocalReturns.scala renamed to ‎library/src/scala/util/control/NonLocalReturns.scala
diff --git a/‎project/Build.scala
Lines changed: 3 additions & 16 deletions b/‎project/Build.scala
Lines changed: 3 additions & 16 deletions
@@ -712,28 +712,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")
     }
   )