Merge pull request #7806 from dotty-staging/move-files-4

Move files after -sourcepath fix, fix sbt-dotty retrieval of dotty

Author: smarter

library/src-bootstrapped/scala/quoted/package.scala

@@ -753,7 +753,7 @@ object Build {
   // Settings shared between dotty-library and dotty-library-bootstrapped
   lazy val dottyLibrarySettings = Seq(
     // 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),
+    scalacOptions in Compile ++= Seq("-sourcepath", (sourceDirectories in Compile).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator)),
   )
 
   lazy val `dotty-library` = project.in(file("library")).asDottyLibrary(NonBootstrapped)

library/src-non-bootstrapped/scala/tasty/reflect/TreeUtils.scala

@@ -404,10 +404,15 @@ object DottyPlugin extends AutoPlugin {
 
   /** Create a scalaInstance task that uses Dotty based on `moduleName`. */
   def dottyScalaInstanceTask(moduleName: String): Initialize[Task[ScalaInstance]] = Def.task {
+    val ivyConfig0 = mkIvyConfiguration.value
+    // When compiling non-bootstrapped projects in the build of Dotty itself,
+    // dependency resolution might pick a local project which is not what we
+    // want. We avoid this by dropping the inter-project resolver.
+    val ivyConfig1 = ivyConfig0.withResolvers(ivyConfig0.resolvers.filter(_.name != "inter-project"))
     val updateReport =
       fetchArtifactsOf(
         scalaOrganization.value %% moduleName % scalaVersion.value,
-        dependencyResolution.value,
+        ivy.IvyDependencyResolution(ivyConfig1),
         scalaModuleInfo.value,
         updateConfiguration.value,
         (unresolvedWarningConfiguration in update).value,
@@ -431,6 +436,25 @@ object DottyPlugin extends AutoPlugin {
     )
   }
 
+  // Copy-pasted from sbt until we upgrade to a version of sbt
+  // with https://github.com/sbt/sbt/pull/5271 in.
+  def mkIvyConfiguration: Initialize[Task[InlineIvyConfiguration]] =
+    Def.task {
+      val (rs, other) = (fullResolvers.value.toVector, otherResolvers.value.toVector)
+      val s = streams.value
+      Classpaths.warnResolversConflict(rs ++: other, s.log)
+      InlineIvyConfiguration()
+        .withPaths(ivyPaths.value)
+        .withResolvers(rs)
+        .withOtherResolvers(other)
+        .withModuleConfigurations(moduleConfigurations.value.toVector)
+        .withLock(Defaults.lock(appConfiguration.value))
+        .withChecksums((checksums in update).value.toVector)
+        .withResolutionCacheDir(crossTarget.value / "resolution-cache")
+        .withUpdateOptions(updateOptions.value)
+        .withLog(s.log)
+    }
+
   def makeScalaInstance(
     state: State, dottyVersion: String, scalaLibrary: File, dottyLibrary: File, compiler: File, all: Seq[File]
   ): ScalaInstance = {