Skip to content

Commit

Permalink
Update bloop-config to 1.5.5 and drop unused jsoniter dependency (#2159)
Browse files Browse the repository at this point in the history
We use our own JSON serializer (upickle) and don't use the provided
ones.

Pull request: #2159
  • Loading branch information
lefou authored Dec 2, 2022
1 parent 3a63870 commit a18849e
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,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.4"
val bloopConfig = ivy"ch.epfl.scala::bloop-config:1.5.5"
val coursier = ivy"io.get-coursier::coursier:2.1.0-RC2"

val flywayCore = ivy"org.flywaydb:flyway-core:8.5.13"
Expand Down Expand Up @@ -883,27 +883,28 @@ object contrib extends MillModule {
object bloop extends MillModule {
override def compileModuleDeps = Seq(scalalib, scalajslib, scalanativelib)
override def ivyDeps = Agg(
Deps.bloopConfig
Deps.bloopConfig.exclude("*" -> s"jsoniter-scala-core_2.13")
)
override def testArgs = T(scalanativelib.testArgs())
override def testModuleDeps: Seq[JavaModule] = super.testModuleDeps ++ Seq(
scalalib,
scalajslib,
scalanativelib
)
override def generatedSources = T {
val dest = T.ctx.dest
T.traverse(dev.moduleDeps)(_.publishSelfDependency)()
def generateBuildinfo = T {
os.write(
dest / "Versions.scala",
T.dest / "Versions.scala",
s"""package mill.contrib.bloop
|
|object Versions {
| val bloop = "${Deps.bloopConfig.dep.version}"
|}
|""".stripMargin
)
super.generatedSources() ++ Seq(PathRef(dest))
PathRef(T.dest)
}
override def generatedSources = T {
super.generatedSources() ++ Seq(generateBuildinfo())
}
}

Expand Down

0 comments on commit a18849e

Please sign in to comment.