Skip to content

Commit

Permalink
Merge pull request #20 from alexarchambault/build-tool-supplied-bridg…
Browse files Browse the repository at this point in the history
…e-jars

Allow build tools to supply bridge JARs themselves
  • Loading branch information
tgodzik authored Apr 22, 2024
2 parents bfa087e + 63834c5 commit 7c6285f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
14 changes: 14 additions & 0 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@ trait CommonPublish extends CiReleaseModule with Mima {

override def mimaPreviousVersions = Seq("1.5.4")

override def mimaBinaryIssueFilters =
Seq(
ProblemFilter.exclude[DirectMissingMethodProblem](
"bloop.config.Config#Scala.copy"
),
ProblemFilter.exclude[DirectMissingMethodProblem](
"bloop.config.Config#Scala.this"
),
ProblemFilter.exclude[DirectMissingMethodProblem](
"bloop.config.Config#Scala.apply"
),
ProblemFilter.exclude[MissingTypesProblem]("bloop.config.Config$Scala$")
)

override def pomSettings = PomSettings(
description = "Bloop configuration library.",
organization = "ch.epfl.scala",
Expand Down
6 changes: 4 additions & 2 deletions config/src/bloop/config/Config.scala
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ object Config {
options: List[String],
jars: List[Path],
analysis: Option[Path],
setup: Option[CompileSetup]
setup: Option[CompileSetup],
bridgeJars: Option[List[Path]]
)

sealed abstract class Platform(val name: String) {
Expand Down Expand Up @@ -350,7 +351,8 @@ object Config {
List("-warn"),
List(),
Some(outAnalysisFile),
Some(CompileSetup.empty)
Some(CompileSetup.empty),
None
)
),
Some(Java(List("-version"))),
Expand Down

0 comments on commit 7c6285f

Please sign in to comment.