@@ -618,14 +618,15 @@ lazy val scaladoc = configureAsSubproject(project)
618
618
)
619
619
.dependsOn(compiler)
620
620
621
+ // dependencies on compiler and compiler-interface are "provided" to align with scala3-sbt-bridge
621
622
lazy val sbtBridge = configureAsSubproject(project, srcdir = Some (" sbt-bridge" ))
622
623
.settings(Osgi .settings)
623
624
.settings(AutomaticModuleName .settings(" scala.sbtbridge" ))
624
625
// .settings(fatalWarningsSettings)
625
626
.settings(
626
627
name := " scala2-sbt-bridge" ,
627
628
description := " sbt compiler bridge for Scala 2" ,
628
- libraryDependencies += compilerInterfaceDep,
629
+ libraryDependencies += compilerInterfaceDep % Provided ,
629
630
generateServiceProviderResources(" xsbti.compile.CompilerInterface2" -> " scala.tools.xsbt.CompilerBridge" ),
630
631
generateServiceProviderResources(" xsbti.compile.ConsoleInterface1" -> " scala.tools.xsbt.ConsoleBridge" ),
631
632
generateServiceProviderResources(" xsbti.compile.ScaladocInterface2" -> " scala.tools.xsbt.ScaladocBridge" ),
@@ -651,7 +652,7 @@ lazy val sbtBridge = configureAsSubproject(project, srcdir = Some("sbt-bridge"))
651
652
|additional information regarding copyright ownership.
652
653
| """ .stripMargin)),
653
654
)
654
- .dependsOn(compiler, replFrontend, scaladoc)
655
+ .dependsOn(compiler % Provided , replFrontend, scaladoc)
655
656
656
657
lazy val scalap = configureAsSubproject(project)
657
658
.settings(fatalWarningsSettings)
@@ -819,7 +820,7 @@ lazy val junit = project.in(file("test") / "junit")
819
820
" -Ypatmat-exhaust-depth" , " 40" , // despite not caring about patmat exhaustiveness, we still get warnings for this
820
821
),
821
822
Compile / javacOptions ++= Seq (" -Xlint" ),
822
- libraryDependencies ++= Seq (junitInterfaceDep, jolDep, diffUtilsDep),
823
+ libraryDependencies ++= Seq (junitInterfaceDep, jolDep, diffUtilsDep, compilerInterfaceDep ),
823
824
testOptions += Tests .Argument (TestFrameworks .JUnit , " -a" , " -v" , " -s" ),
824
825
Compile / unmanagedSourceDirectories := Nil ,
825
826
Test / unmanagedSourceDirectories := List (baseDirectory.value),
0 commit comments