From c6176342fb67685dd86879a31822fa17a422c613 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Wed, 6 Mar 2024 13:59:33 +0100 Subject: [PATCH] Remove dep to zinc-compile --- build.sbt | 4 ++-- project/Dependencies.scala | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 500e7bc52..138ab9d89 100644 --- a/build.sbt +++ b/build.sbt @@ -896,7 +896,7 @@ lazy val buildFileProj = (project in file("buildfile")) addSbtLmCore, addSbtLmIvy, addSbtCompilerInterface, - addSbtZincCompile + addSbtZincCompileCore ) // The main integration project for sbt. It brings all of the projects together, configures them, and provides for overriding conventions. @@ -952,7 +952,7 @@ lazy val mainProj = (project in file("main")) addSbtLmCore, addSbtLmIvy, addSbtCompilerInterface, - addSbtZincCompile + addSbtZincCompileCore ) // Strictly for bringing implicits and aliases from subsystems into the top-level sbt namespace through a single package object diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 14b00b855..7a2c93a0c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -16,7 +16,7 @@ object Dependencies { private val ioVersion = nightlyVersion.getOrElse("1.8.0") private val lmVersion = sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha13") - val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha10") + val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha11-SNAPSHOT") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion @@ -34,7 +34,6 @@ object Dependencies { private val compilerApiInfo = "org.scala-sbt" %% "zinc-apiinfo" % zincVersion private val compilerBridge = "org.scala-sbt" %% "compiler-bridge" % zincVersion private val zinc = "org.scala-sbt" %% "zinc" % zincVersion - private val zincCompile = "org.scala-sbt" %% "zinc-compile" % zincVersion private val zincCompileCore = "org.scala-sbt" %% "zinc-compile-core" % zincVersion def getSbtModulePath(key: String) = { @@ -76,7 +75,6 @@ object Dependencies { def addSbtCompilerApiInfo = addSbtModule(sbtZincPath, "zincApiInfo", compilerApiInfo) def addSbtCompilerBridge = addSbtModule(sbtZincPath, "compilerBridge2_12", compilerBridge) def addSbtZinc = addSbtModule(sbtZincPath, "zinc", zinc) - def addSbtZincCompile = addSbtModule(sbtZincPath, "zincCompile", zincCompile) def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) // val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10"