Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update bloop-config to 1.5.4 and update used API #2135

Merged
merged 1 commit into from
Nov 24, 2022
Merged

Update bloop-config to 1.5.4 and update used API #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ object Deps {
"org.scalameta" -> "trees_2.13"
)
val asciidoctorj = ivy"org.asciidoctor:asciidoctorj:2.4.3"
val bloopConfig = ivy"ch.epfl.scala::bloop-config:1.5.3"
val bloopConfig = ivy"ch.epfl.scala::bloop-config:1.5.4"
val coursier = ivy"io.get-coursier::coursier:2.1.0-RC2"

val flywayCore = ivy"org.flywaydb:flyway-core:8.5.13"
Expand Down
3 changes: 2 additions & 1 deletion contrib/bloop/src/mill/contrib/bloop/BloopFormats.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,15 @@ object BloopFormats {
implicit val platformJvmRW: ReadWriter[BloopConfig.Platform.Jvm] = macroRW
implicit val platformNativeRW: ReadWriter[BloopConfig.Platform.Native] = macroRW
implicit val platformRW: ReadWriter[BloopConfig.Platform] = macroRW
implicit val projectRW: ReadWriter[BloopConfig.Project] = macroRW
implicit val resolutionRW: ReadWriter[BloopConfig.Resolution] = macroRW
implicit val sbtRW: ReadWriter[BloopConfig.Sbt] = macroRW
implicit val scalaRw: ReadWriter[BloopConfig.Scala] = macroRW
implicit val sourcesGlobsRW: ReadWriter[BloopConfig.SourcesGlobs] = macroRW
implicit val sourceGeneratorRW: ReadWriter[BloopConfig.SourceGenerator] = macroRW
implicit val testArgumentRW: ReadWriter[BloopConfig.TestArgument] = macroRW
implicit val testFrameworkRW: ReadWriter[BloopConfig.TestFramework] = macroRW
implicit val testOptionsRW: ReadWriter[BloopConfig.TestOptions] = macroRW
implicit val testRW: ReadWriter[BloopConfig.Test] = macroRW
implicit val projectRW: ReadWriter[BloopConfig.Project] = macroRW

}
3 changes: 2 additions & 1 deletion contrib/bloop/src/mill/contrib/bloop/BloopImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,8 @@ class BloopImpl(ev: () => Evaluator, wd: os.Path) extends ExternalModule { outer
test = testConfig(),
platform = Some(platform()),
resolution = Some(bloopResolution()),
tags = Some(tags)
tags = Some(tags),
sourceGenerators = None // TODO: are we supposed to hook generated sources here?
)
}

Expand Down