Skip to content

Commit

Permalink
Make scala2-sbt-bridge's dependencies "provided" (align with Scala 3)
Browse files Browse the repository at this point in the history
  • Loading branch information
lrytz committed Aug 3, 2023
1 parent 35a23d6 commit bac6a23
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -618,14 +618,15 @@ lazy val scaladoc = configureAsSubproject(project)
)
.dependsOn(compiler)

// dependencies on compiler and compiler-interface are "provided" to align with scala3-sbt-bridge
lazy val sbtBridge = configureAsSubproject(project, srcdir = Some("sbt-bridge"))
.settings(Osgi.settings)
.settings(AutomaticModuleName.settings("scala.sbtbridge"))
//.settings(fatalWarningsSettings)
.settings(
name := "scala2-sbt-bridge",
description := "sbt compiler bridge for Scala 2",
libraryDependencies += compilerInterfaceDep,
libraryDependencies += compilerInterfaceDep % Provided,
generateServiceProviderResources("xsbti.compile.CompilerInterface2" -> "scala.tools.xsbt.CompilerBridge"),
generateServiceProviderResources("xsbti.compile.ConsoleInterface1" -> "scala.tools.xsbt.ConsoleBridge"),
generateServiceProviderResources("xsbti.compile.ScaladocInterface2" -> "scala.tools.xsbt.ScaladocBridge"),
Expand All @@ -651,7 +652,7 @@ lazy val sbtBridge = configureAsSubproject(project, srcdir = Some("sbt-bridge"))
|additional information regarding copyright ownership.
|""".stripMargin)),
)
.dependsOn(compiler, replFrontend, scaladoc)
.dependsOn(compiler % Provided, replFrontend, scaladoc)

lazy val scalap = configureAsSubproject(project)
.settings(fatalWarningsSettings)
Expand Down

0 comments on commit bac6a23

Please sign in to comment.