Re-bootstrap compiler

Author: nicolasstucki

project/Build.scala

@@ -386,11 +386,6 @@ object Build {
     Compile / doc / scalacOptions ++= scalacOptionsDocSettings,
     // sbt-dotty defines `scalaInstance in doc` so we need to override it manually
     doc / scalaInstance := scalaInstance.value,
-<<<<<<< HEAD
-=======
-
-    disableDocSetting,
->>>>>>> 5b2ab78721 (Move to sbt slash syntax)
   )
 
   lazy val commonBenchmarkSettings = Seq(
@@ -717,11 +712,6 @@ object Build {
     (Compile / scalacOptions) ++= Seq(
       // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called
       "-sourcepath", (Compile / sourceDirectories).value.map(_.getAbsolutePath).distinct.mkString(File.pathSeparator),
-<<<<<<< HEAD
-=======
-     // support declaration of scala.compiletime.erasedValue
-      "-Yerased-terms"
->>>>>>> 5b2ab78721 (Move to sbt slash syntax)
     ),
   )
 
@@ -758,11 +748,7 @@ object Build {
     settings(
       libraryDependencies +=
         ("org.scala-js" %% "scalajs-library" % scalaJSVersion).withDottyCompat(scalaVersion.value),
-<<<<<<< HEAD
       Compile / unmanagedSourceDirectories ++=
-=======
-      Compile / unmanagedSourceDirectories :=
->>>>>>> 5b2ab78721 (Move to sbt slash syntax)
         (`scala3-library-bootstrapped` / Compile / unmanagedSourceDirectories).value,
 
       // Configure the source maps to point to GitHub for releases
@@ -1742,27 +1728,12 @@ object Build {
           (Test / Build.testcasesSourceRoot),
           Build.testDocumentationRoot,
         ),
-<<<<<<< HEAD
-=======
-        Compile / resourceGenerators += Def.task {
-          val jsDestinationFile = (Compile / resourceManaged).value / "dotty_res" / "scripts" / "searchbar.js"
-          sbt.IO.copyFile((`scaladoc-js` / Compile / fullOptJS).value.data, jsDestinationFile)
-          Seq(jsDestinationFile)
-        }.taskValue,
-        Compile / resourceGenerators += Def.task {
-          val cssDesitnationFile = (Compile / resourceManaged).value / "dotty_res" / "styles" / "scaladoc-searchbar.css"
-          val cssSourceFile = (`scaladoc-js` / Compile / resourceDirectory).value / "scaladoc-searchbar.css"
-          sbt.IO.copyFile(cssSourceFile, cssDesitnationFile)
-          Seq(cssDesitnationFile)
-        }.taskValue,
->>>>>>> 5b2ab78721 (Move to sbt slash syntax)
         testDocumentationRoot := (baseDirectory.value / "test-documentations").getAbsolutePath,
         Test / buildInfoPackage := "dotty.tools.scaladoc.test",
         BuildInfoPlugin.buildInfoScopedSettings(Test),
       )
     }
 
-<<<<<<< HEAD
     def asScaladocTestcases(implicit mode: Mode): Project =
       if (mode == Bootstrapped)
         project.dependsOn(`scala3-compiler-bootstrapped`).settings(commonBootstrappedSettings)
@@ -1780,21 +1751,6 @@ object Build {
         libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value)
       )
     }
-=======
-    def asScaladocTestcases: Project =
-      project.dependsOn(`scala3-compiler-bootstrapped`).settings(commonBootstrappedSettings)
-
-    def asScaladocJs: Project =
-      project.
-        enablePlugins(MyScalaJSPlugin).
-        dependsOn(`scala3-library-bootstrappedJS`).
-        settings(
-          Test / fork := false,
-          scalaJSUseMainModuleInitializer := true,
-          libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").withDottyCompat(scalaVersion.value)
-        )
-
->>>>>>> 5b2ab78721 (Move to sbt slash syntax)
 
     def asDist(implicit mode: Mode): Project = project.
       enablePlugins(PackPlugin).