luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dep to zinc-compile

This commit is contained in:
Adrien Piquerez 2024-03-06 13:59:33 +01:00
parent 12e9267e1e
commit c6176342fb
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -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

4
project/Dependencies.scala
View File

@ -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"