Skip to content

Commit 8edad1f

Browse files
committed
update zinc version from 1.4.0-M12 to 1.4.3
NOTE 1 (reminder): zinc also transitively includes compiler-interface NOTE 2: scala3-sbt-bridge 3.0.1 depends on compile-interface 1.4.3, scala3-compiler depends on 1.3.5 (which is partially binary compatible with 1.4.3) scala/scala3#13084 (review) NOTE 2: if this change breaks anything for some reason, try changing the version to 1.4.4 instead of reverting to 1.4.0-M12. I tried to compile some example project with Bloop and it at least didn't fail.
1 parent 9a7fbfb commit 8edad1f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

project/dependencies.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object Versions {
88
// run runtimeDependencies/update manually
99
val sbtVersion: String = Sbt.latest
1010
val bloopVersion = "1.4.8-81-e170cd66"
11-
val zincVersion = "1.4.0-M12"
11+
val zincVersion = "1.4.3"
1212
val intellijVersion = "212.4638.7"
1313
val bspVersion = "2.0.0-M14"
1414
val sbtStructureVersion: String = "2021.1.1"
@@ -106,8 +106,9 @@ object Dependencies {
106106
val compilerIndicesProtocol: ModuleID = "org.jetbrains.scala" %% "scala-compiler-indices-protocol" % compilerIndicesVersion
107107

108108
val zinc = "org.scala-sbt" %% "zinc" % zincVersion
109+
/** actually this is is compilerInterface (TODO: rename, cause naming difference is misleading) */
109110
val zincInterface = "org.scala-sbt" % "compiler-interface" % zincVersion
110-
val sbtInterface = "org.scala-sbt" % "util-interface" % "1.3.0"
111+
val sbtInterface = "org.scala-sbt" % "util-interface" % "1.4.0"
111112

112113
val compilerBridgeSources_2_10 = "org.scala-sbt" % "compiler-bridge_2.10" % zincVersion classifier "sources"
113114
val compilerBridgeSources_2_11 = "org.scala-sbt" % "compiler-bridge_2.11" % zincVersion classifier "sources"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CompilerFactoryImpl(sbtData: SbtData) extends CompilerFactory {
2828
case IncrementalityType.SBT =>
2929
val javac = {
3030
val scala = getScalaInstance(compilerData.compilerJars)
31-
.getOrElse(new ScalaInstance("stub", null, null, new File(""), new File(""), Array.empty, None))
31+
.getOrElse(new ScalaInstance("stub", null, null, Array.empty[File], new File(""), Array.empty[File], None))
3232
val classpathOptions = ClasspathOptionsUtil.javac(false)
3333
JavaTools.directOrFork(scala, classpathOptions, compilerData.javaHome.map(_.toPath))
3434
}

0 commit comments

Comments
 (0)