Skip to content

Commit

Permalink
Use new target JavaModule.compileModuleDeps for contrib modules (#964)
Browse files Browse the repository at this point in the history
This is a follow-up to #955

This really fixes #828.

Pull request: #964

Commits:

* Use new target JavaModule.compileModuleDeps for contrib modules

* Bump mill version to make compileModuleDeps available

* More override qualifier to ensure mill knows the target
  • Loading branch information
lefou authored Sep 16, 2020
1 parent 8cd135a commit 375f4e8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0
0.8.0-11-8cd135
40 changes: 23 additions & 17 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,12 @@ object contrib extends MillModule {
}

object twirllib extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
}

object playlib extends MillModule {
def moduleDeps = Seq(scalalib, twirllib, playlib.api)
def moduleDeps = Seq(twirllib, playlib.api)
override def compileModuleDeps = Seq(scalalib)

def testArgs = T {
val mapping = Map(
Expand Down Expand Up @@ -404,15 +405,16 @@ object contrib extends MillModule {
}

object scalapblib extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
}

object scoverage extends MillModule {
object api extends MillApiModule {
def moduleDeps = Seq(main.api)
override def compileModuleDeps = Seq(main.api)
}

def moduleDeps = Seq(scalalib, scoverage.api)
def moduleDeps = Seq(scoverage.api)
override def compileModuleDeps = Seq(scalalib)

def testArgs = T {
val mapping = Map(
Expand All @@ -431,15 +433,19 @@ object contrib extends MillModule {

object worker extends MillApiModule {
def moduleDeps = Seq(scoverage.api)
def compileIvyDeps = T{
// compile-time only, need to provide the correct scoverage version runtime
Agg(Deps.scalacScoveragePlugin)
override def compileIvyDeps = T{
Agg(
// compile-time only, need to provide the correct scoverage version runtime
Deps.scalacScoveragePlugin,
// provided by mill runtime
Deps.osLib
)
}
}
}

object buildinfo extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
// why do I need this?
def testArgs = T{
Seq("-Djna.nosys=true") ++
Expand All @@ -449,25 +455,25 @@ object contrib extends MillModule {
}

object tut extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
def testArgs = T{
scalalib.worker.testArgs() ++
scalalib.backgroundwrapper.testArgs()
}
}

object flyway extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
def ivyDeps = Agg(Deps.flywayCore)
}


object docker extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
}

object bloop extends MillModule {
def moduleDeps = Seq(scalalib, scalajslib, scalanativelib)
override def compileModuleDeps = Seq(scalalib, scalajslib, scalanativelib)
def ivyDeps = Agg(
Deps.bloopConfig
)
Expand All @@ -476,7 +482,7 @@ object contrib extends MillModule {

object bsp extends MillModule {

def moduleDeps = Seq(scalalib, scalajslib, main, scalanativelib)
override def compileModuleDeps = Seq(scalalib, scalajslib, main, scalanativelib)
def ivyDeps = Agg(
Deps.bsp,
Deps.ujsonCirce,
Expand All @@ -485,15 +491,15 @@ object contrib extends MillModule {
}

object artifactory extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
}

object versionfile extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
}

object bintray extends MillModule {
def moduleDeps = Seq(scalalib)
override def compileModuleDeps = Seq(scalalib)
}

}
Expand Down

0 comments on commit 375f4e8

Please sign in to comment.