Merge pull request #1600 from tgodzik/update-zinc-fork

Update zinc fork with the newest fixes
scalacenter · Nov 2, 2021 · e2e6ede · e2e6ede
2 parents c483ea3 + 8dca9ea
commit e2e6ede
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/backend/src/main/scala/sbt/internal/inc/BloopComponentCompiler.scala b/backend/src/main/scala/sbt/internal/inc/BloopComponentCompiler.scala
@@ -108,11 +108,6 @@ object BloopComponentCompiler {
       scalaVersion.startsWith("2.13.2")
     }
 
-    private def isTooRecentFor213Before3(bridgeSources: ModuleID): Boolean = {
-      bridgeSources.revision == "1.3.0-M4+45-d4354be3" ||
-      bridgeSources.revision == "1.3.0-M4+46-edbe573e"
-    }
-
     /**
      * Defines a richer interface for Scala users that want to pass in an explicit module id.
      *
@@ -121,13 +116,10 @@ object BloopComponentCompiler {
      */
     private def compiledBridge(bridgeSources0: ModuleID, scalaInstance: ScalaInstance): File = {
       val scalaVersion = scalaInstance.version()
-      val requiresPrevZincVersion =
-        isTooRecentFor213Before3(bridgeSources0) && is213ThatNeedsPreviousZinc(
-          scalaVersion
-        )
       val bridgeSources =
-        if (!requiresPrevZincVersion) bridgeSources0
-        else bridgeSources0.withRevision("1.3.0-M4+42-5daa8ed7")
+        if (is213ThatNeedsPreviousZinc(scalaVersion))
+          bridgeSources0.withRevision("1.3.0-M4+42-5daa8ed7")
+        else bridgeSources0
       val raw = new RawCompiler(scalaInstance, ClasspathOptionsUtil.auto, logger)
       val zinc = new BloopComponentCompiler(raw, manager, bridgeSources, logger, scheduler)
       logger.debug(s"Getting $bridgeSources for Scala ${scalaInstance.version}")(

diff --git a/frontend/src/test/scala/bloop/ScalaVersionsSpec.scala b/frontend/src/test/scala/bloop/ScalaVersionsSpec.scala
@@ -69,10 +69,11 @@ object ScalaVersionsSpec extends bloop.testing.BaseSuite {
     val `2.12` = compileProjectFor("2.12.9")
     val `2.13` = compileProjectFor("2.13.2")
     val `2.13.3` = compileProjectFor("2.13.3")
+    val `2.13.7` = compileProjectFor("2.13.7")
     val LatestDotty = compileProjectFor("3.0.0-M3")
     val all = {
-      if (TestUtil.isJdk8) List(`2.10`, `2.11`, `2.12`, `2.13`, `2.13.3`, LatestDotty)
-      else List(`2.12`, `2.13`, `2.13.3`)
+      if (TestUtil.isJdk8) List(`2.10`, `2.11`, `2.12`, `2.13`, `2.13.3`, `2.13.7`, LatestDotty)
+      else List(`2.12`, `2.13`, `2.13.3`, `2.13.7`)
     }
 
     try {

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -13,7 +13,7 @@ object Dependencies {
   val nailgunCommit = "a2520c1e"
 
   // Keep in sync in BloopComponentCompiler
-  val zincVersion = "1.3.0-M4+46-edbe573e"
+  val zincVersion = "1.3.0-M4+47-d881fa2f"
 
   val bspVersion = "2.0.0-M13"
   val javaDebugVersion = "0.21.0+1-7f1080f1"

diff --git a/zinc b/zinc
+8 −6		internal/compiler-bridge/src/main/scala_2.13/xsbt/ZincSymbolLoaders.scala
+1 −1		project/Dependencies.scala