drop compilation for dotty (<= 0.27) (Scala 3 compilation remains)

Author: unkarjedy

build.sbt

@@ -500,7 +500,6 @@ lazy val runtimeDependencies =
         Dependencies.sbtLaunch -> Some("launcher/sbt-launch.jar"),
         Dependencies.sbtInterface -> Some("lib/jps/sbt-interface.jar"),
         Dependencies.zincInterface -> Some("lib/jps/compiler-interface.jar"),
-        Dependencies.dottySbtBridge -> Some("lib/jps/dotty-sbt-bridge.jar"),
         Dependencies.scala3SbtBridge -> Some("lib/jps/scala3-sbt-bridge.jar"),
         Dependencies.compilerBridgeSources_2_13 -> Some("lib/jps/compiler-interface-sources-2.13.jar"),
         Dependencies.compilerBridgeSources_2_11 -> Some("lib/jps/compiler-interface-sources-2.11.jar"),

project/dependencies.scala

@@ -112,7 +112,6 @@ object Dependencies {
   val compilerBridgeSources_2_10 = "org.scala-sbt" % "compiler-bridge_2.10" % zincVersion classifier "sources"
   val compilerBridgeSources_2_11 = "org.scala-sbt" % "compiler-bridge_2.11" % zincVersion classifier "sources"
   val compilerBridgeSources_2_13 = "org.scala-sbt" % "compiler-bridge_2.13" % zincVersion classifier "sources"
-  val dottySbtBridge = "ch.epfl.lamp" % "dotty-sbt-bridge" % "0.27.0-RC1"
   val scala3SbtBridge = "org.scala-lang" % "scala3-sbt-bridge" % "3.0.0-M2"
 
   // "provided" danger: we statically depend on a single version, but need to support all the version
@@ -198,7 +197,6 @@ object DependencyGroups {
     compilerBridgeSources_2_10,
     compilerBridgeSources_2_11,
     compilerBridgeSources_2_13,
-    dottySbtBridge,
     scala3SbtBridge
   )
 }

scala/compiler-jps/src/org/jetbrains/jps/incremental/scala/IdeaIncrementalBuilder.scala

@@ -73,8 +73,7 @@ class IdeaIncrementalBuilder(category: BuilderCategory) extends ModuleLevelBuild
 
     val successfullyCompiled = mutable.Set.empty[File]
 
-    val compilerName = if (data.CompilerDataFactory.hasDotty(modules)) "dotc"
-    else "scalac"
+    val compilerName = "scalac"
 
     val client = new local.IdeClientIdea(compilerName, context, chunk, outputConsumer,
       callback, successfullyCompiled, packageObjectsData)

scala/compiler-jps/src/org/jetbrains/jps/incremental/scala/data/ArgumentsParser.scala

@@ -27,7 +27,6 @@ object ArgumentsParser
       PathToFile(scalaBridgeSourceJar_2_10),
       PathToFile(scalaBridgeSourceJar_2_11),
       PathToFile(scalaBridgeSourceJar_2_13),
-      PathToFile(dottyBridgeJar),
       PathToFile(scala3BridgeJar),
       PathToFile(interfacesHome),
       javaClassVersion,
@@ -59,7 +58,6 @@ object ArgumentsParser
         _2_13 = scalaBridgeSourceJar_2_13
       )
       val dottyBridges = SbtData.Scala3Jars(
-        dotty = dottyBridgeJar,
         scala3 = scala3BridgeJar
       )
       val compilerBridges = SbtData.CompilerBridges(scalaBridgeSources, dottyBridges)

scala/compiler-jps/src/org/jetbrains/jps/incremental/scala/data/CompilerDataFactory.scala

@@ -96,17 +96,9 @@ object CompilerDataFactory
       }
   }
 
-  def hasDotty(modules: Set[JpsModule]): Boolean =
-    modules.exists {
-      compilerJarsIn(_).exists(_.hasDotty)
-    }
   def hasScala3(modules: Set[JpsModule]): Boolean =
     modules.exists {
-      compilerJarsIn(_).exists(_.hasDotty)
-    }
-  def hasScala3OrDotty(modules: Set[JpsModule]): Boolean =
-    modules.exists {
-      compilerJarsIn(_).exists(_.hasScala3OrDotty)
+      compilerJarsIn(_).exists(_.hasScala3)
     }
 
   private def hasOldScala(modules: Set[JpsModule]) =
@@ -123,11 +115,11 @@ object CompilerDataFactory
   def scalaOptionsFor(compilerSettings: CompilerSettings, chunk: ModuleChunk): Seq[String] = {
     val configuredOptions = compilerSettings.getCompilerOptions
     val modules = chunk.getModules.asScala.toSet
-    val hasScala3OrDotty = CompilerDataFactory.hasScala3OrDotty(modules)
+    val hasScala3 = CompilerDataFactory.hasScala3(modules)
 
     bootClasspathOptions(hasOldScala(modules)) ++
       semanticDbOptionsFor(configuredOptions.toIndexedSeq, chunk) ++
-      configuredOptions.filterNot(_.startsWith("-g:") && hasScala3OrDotty) // TODO SCL-16881
+      configuredOptions.filterNot(_.startsWith("-g:") && hasScala3) // TODO SCL-16881
   }
 
   private def bootClasspathOptions(hasOldScala: Boolean): Seq[String] =

scala/compiler-jps/src/org/jetbrains/jps/incremental/scala/local/CompilerFactoryImpl.scala

@@ -52,7 +52,6 @@ class CompilerFactoryImpl(sbtData: SbtData) extends CompilerFactory {
         scalaInstance = scalaInstance,
         javaClassVersion = sbtData.javaClassVersion,
         client = Option(client),
-        isDotty = compilerJars.exists(_.hasDotty),
         isScala3 = compilerJars.exists(_.hasScala3),
       )
 
@@ -114,11 +113,8 @@ object CompilerFactoryImpl {
                                        scalaInstance: ScalaInstance,
                                        javaClassVersion: String,
                                        client: Option[Client],
-                                       isDotty: Boolean,
                                        isScala3: Boolean): File =
-    if (isDotty)
-      compilerBridges.scala3.dotty
-    else if (isScala3)
+    if (isScala3)
       compilerBridges.scala3.scala3
     else {
       val scalaVersion = scalaInstance.actualVersion

scala/compiler-shared/src/org/jetbrains/jps/incremental/scala/package.scala

@@ -25,15 +25,8 @@ package object scala {
     def |>[R](f: T => R): R = f(v)
   }
 
-  def containsDotty(files: Iterable[File]): Boolean =
-    files.exists(_.getName.startsWith("dotty"))
   def containsScala3(files: Iterable[File]): Boolean =
     files.exists(_.getName.startsWith("scala3"))
-  def containsScala3OrDotty(files: Iterable[File]): Boolean =
-    files.exists(f => {
-      val name = f.getName
-      name.startsWith("scala3") ||  name.startsWith("dotty")
-    })
 
   // TODO implement a better version comparison
   def compilerVersionIn(compiler: File, versions: String*): Boolean =

scala/compiler-shared/src/org/jetbrains/plugins/scala/compiler/data/Arguments.scala

@@ -29,7 +29,6 @@ case class Arguments(sbtData: SbtData,
       fileToPath(sbtData.compilerBridges.scala._2_10),
       fileToPath(sbtData.compilerBridges.scala._2_11),
       fileToPath(sbtData.compilerBridges.scala._2_13),
-      fileToPath(sbtData.compilerBridges.scala3.dotty),
       fileToPath(sbtData.compilerBridges.scala3.scala3),
       fileToPath(sbtData.interfacesHome),
       sbtData.javaClassVersion,

scala/compiler-shared/src/org/jetbrains/plugins/scala/compiler/data/CompilerJars.scala

@@ -1,8 +1,8 @@
 package org.jetbrains.plugins.scala.compiler.data
 
-import java.io.File
+import org.jetbrains.jps.incremental.scala.containsScala3
 
-import org.jetbrains.jps.incremental.scala.{containsDotty, containsScala3, containsScala3OrDotty}
+import java.io.File
 
 /**
  * @author Pavel Fatin
@@ -11,12 +11,8 @@ case class CompilerJars(libraries: Seq[File],
                         compiler: File,
                         extra: Seq[File]) {
 
-  def hasDotty: Boolean =
-    containsDotty(extra)
   def hasScala3: Boolean =
     containsScala3(extra)
-  def hasScala3OrDotty: Boolean =
-    containsScala3OrDotty(extra)
 
   def allJars: Seq[File] =
     libraries ++ extra :+ compiler

scala/compiler-shared/src/org/jetbrains/plugins/scala/compiler/data/CompilerJarsFactory.scala

@@ -1,12 +1,12 @@
 package org.jetbrains.plugins.scala.compiler.data
 
-import java.io.File
-
-import org.jetbrains.jps.incremental.scala.{compilerVersionIn, containsDotty, containsScala3}
+import org.jetbrains.jps.incremental.scala.{compilerVersionIn, containsScala3}
 import org.jetbrains.plugins.scala.compiler.data.CompilerJarsFactory.CompilerJarsResolveError
 import org.jetbrains.plugins.scala.util.JarUtil
 import org.jetbrains.plugins.scala.util.JarUtil.JarFileWithName
 
+import java.io.File
+
 trait CompilerJarsFactory {
 
   def fromFiles(files: Seq[File]): Either[CompilerJarsResolveError, CompilerJars]
@@ -31,8 +31,7 @@ object CompilerJarsFactory
   def fromJarFiles(files: Seq[JarFileWithName]): Either[CompilerJarsResolveError, CompilerJars] = {
     val ioFiles = files.map(_.file)
     val compilerPrefix =
-      if (containsDotty(ioFiles)) "dotty"
-      else if (containsScala3(ioFiles)) "scala3"
+      if (containsScala3(ioFiles)) "scala3"
       else "scala"
 
     val init: Either[CompilerJarsResolveError, Seq[JarFileWithName]] = Right(Seq.empty)

scala/compiler-shared/src/org/jetbrains/plugins/scala/compiler/data/SbtData.scala

@@ -32,7 +32,7 @@ object SbtData {
   /**
    * Contains already compiled dotty/scala3 compiler bridges.
    */
-  case class Scala3Jars(dotty: File, scala3: File)
+  case class Scala3Jars(scala3: File)
 
   val compilerInterfacesKey = "scala.compiler.interfaces.dir"
 
@@ -61,7 +61,6 @@ object SbtData {
       scalaBridge_2_10     <- fileWithName("compiler-interface-sources-2.10.jar")
       scalaBridge_2_11     <- fileWithName("compiler-interface-sources-2.11.jar")
       scalaBridge_2_13     <- fileWithName("compiler-interface-sources-2.13.jar")
-      dottyBridge          <- fileWithName("dotty-sbt-bridge.jar")
       scala3Bridge         <- fileWithName("scala3-sbt-bridge.jar")
       sbtVersion           <- readSbtVersionFrom(sbtInterfaceJar)
     } yield {
@@ -73,7 +72,6 @@ object SbtData {
         _2_13 = scalaBridge_2_13
       )
       val dottyBridges = Scala3Jars(
-        dotty = dottyBridge,
         scala3 = scala3Bridge
       )
       val compilerBridges = CompilerBridges(scalaBridgeSources, dottyBridges)