Remove meta-dependency on DottyPlugin

Author: adpi2

project/Bootstrap.scala

@@ -0,0 +1,39 @@
+package sbt
+
+import sbt.internal.classpath.ClassLoaderCache
+import sbt.internal.inc.ScalaInstance
+
+object Bootstrap {
+  // copied from https://github.com/sbt/sbt/blob/33e2bfe2810246c8e4e1b37ec110d15e588a4fce/main/src/main/scala/sbt/Defaults.scala#L1120-L1165
+  def makeScalaInstance(
+    version: String,
+    libraryJars: Array[File],
+    allCompilerJars: Seq[File],
+    allDocJars: Seq[File],
+    state: State,
+    topLoader: ClassLoader
+  ): ScalaInstance = {
+    val classLoaderCache = state.extendedClassLoaderCache
+    val compilerJars = allCompilerJars.filterNot(libraryJars.contains).distinct.toArray
+    val docJars = allDocJars
+      .filterNot(jar => libraryJars.contains(jar) || compilerJars.contains(jar))
+      .distinct.toArray
+    val allJars = libraryJars ++ compilerJars ++ docJars
+
+    val libraryLoader = classLoaderCache(libraryJars.toList, topLoader)
+    val compilerLoader = classLoaderCache(compilerJars.toList, libraryLoader)
+    val fullLoader =
+      if (docJars.isEmpty) compilerLoader
+      else classLoaderCache(docJars.distinct.toList, compilerLoader)
+    new ScalaInstance(
+      version = version,
+      loader = fullLoader,
+      loaderCompilerOnly = compilerLoader,
+      loaderLibraryOnly = libraryLoader,
+      libraryJars = libraryJars,
+      compilerJars = compilerJars,
+      allJars = allJars,
+      explicitActual = Some(version)
+    )
+  }
+}

project/Build.scala

@@ -15,8 +15,6 @@ import xerial.sbt.pack.PackPlugin
 import xerial.sbt.pack.PackPlugin.autoImport._
 import xerial.sbt.Sonatype.autoImport._
 
-import dotty.tools.sbtplugin.DottyPlugin.autoImport._
-import dotty.tools.sbtplugin.DottyPlugin.makeScalaInstance
 import dotty.tools.sbtplugin.DottyIDEPlugin.{ installCodeExtension, prepareCommand, runProcess }
 import dotty.tools.sbtplugin.DottyIDEPlugin.autoImport._
 
@@ -43,7 +41,7 @@ object MyScalaJSPlugin extends AutoPlugin {
       _.filter(!_.name.startsWith("junit-interface"))
     },
     libraryDependencies +=
-      ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion  % "test").withDottyCompat(scalaVersion.value),
+      ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion  % "test").cross(CrossVersion.for3Use2_13),
 
     // Typecheck the Scala.js IR found on the classpath
     scalaJSLinkerConfig ~= (_.withCheckIR(true)),
@@ -329,16 +327,17 @@ object Build {
       val dottyCompiler = packageBin.in(`scala3-compiler`, Compile).value
       val scaladoc = packageBin.in(`scaladoc-nonBootstrapped`, Compile).value
 
+      val allCompilerJars = Seq(tastyCore, dottyLibrary, dottyInterfaces, dottyCompiler) ++ externalNonBootstrappedDeps.map(_.data)
+      val allDocJars = Seq(scaladoc)
       val allJars = Seq(tastyCore, dottyLibrary, dottyInterfaces, dottyCompiler, scaladoc) ++ externalNonBootstrappedDeps.map(_.data)
 
-      makeScalaInstance(
-        state.value,
+      sbt.Bootstrap.makeScalaInstance(
         scalaVersion.value,
-        scalaLibrary,
-        dottyLibrary,
-        dottyCompiler,
-        allJars,
-        appConfiguration.value
+        Array(scalaLibrary, dottyLibrary),
+        allCompilerJars,
+        Seq(scaladoc),
+        state.value,
+        scalaInstanceTopLoader.value
       )
     },
     // sbt-dotty defines `scalaInstance in doc` so we need to override it manually
@@ -542,7 +541,7 @@ object Build {
       ivyConfigurations += SourceDeps.hide,
       transitiveClassifiers := Seq("sources"),
       libraryDependencies +=
-        ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").withDottyCompat(scalaVersion.value),
+        ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").cross(CrossVersion.for3Use2_13),
       sourceGenerators in Compile += Def.task {
         val s = streams.value
         val cacheDir = s.cacheDirectory
@@ -705,7 +704,7 @@ object Build {
     enablePlugins(MyScalaJSPlugin).
     settings(
       libraryDependencies +=
-        ("org.scala-js" %% "scalajs-library" % scalaJSVersion).withDottyCompat(scalaVersion.value),
+        ("org.scala-js" %% "scalajs-library" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
       unmanagedSourceDirectories in Compile :=
         (unmanagedSourceDirectories in (`scala3-library-bootstrapped`, Compile)).value,
 
@@ -1038,7 +1037,7 @@ object Build {
 
       // We need JUnit in the Compile configuration
       libraryDependencies +=
-        ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion).withDottyCompat(scalaVersion.value),
+        ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion).cross(CrossVersion.for3Use2_13),
 
       sourceGenerators in Compile += Def.task {
         import org.scalajs.linker.interface.CheckedBehavior
@@ -1688,7 +1687,7 @@ object Build {
         settings(
           fork in Test := false,
           scalaJSUseMainModuleInitializer := true,
-          libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value)
+          libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)
         )
 
 

project/build.sbt

@@ -1,16 +1,17 @@
 // Used by VersionUtil to get gitHash and commitDate
 libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.201803080745-r"
 
-// Include the sources of the sbt-dotty plugin in the project build,
+// Include the source of DottyIDEPlugin in the project build,
 // so that we can use the current in-development version of the plugin
 // in our build instead of a released version.
+// We do not add SbtDottyPlugin to show that it is not usefull anymore
+// However, adding one source but not the others is very fragile
 
-unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src"
+unmanagedSources in Compile += baseDirectory.value / "../sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala"
 
 // Keep in sync with `sbt-dotty` config in Build.scala
 libraryDependencies ++= Seq(
-  Dependencies.`jackson-databind`,
-  Dependencies.newCompilerInterface
+  Dependencies.`jackson-databind`
 )
 unmanagedSourceDirectories in Compile +=
   baseDirectory.value / "../language-server/src/dotty/tools/languageserver/config"

project/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.4.4

sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala

@@ -13,7 +13,6 @@ import dotty.tools.languageserver.config.ProjectConfig
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import scala.collection.mutable.ListBuffer
-import DottyPlugin.autoImport._
 
 object DottyIDEPlugin extends AutoPlugin {
   object autoImport {