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.

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

Add JavaModule.mandatoryJavacOptions #3503

Merged
merged 11 commits into from
Sep 10, 2024
Merged
Prev Previous commit
Next Next commit
Don't propagae mandatoryScalacOptions to tests, too
Needed to add a MiMa exclusion, which should be safe in this case.
lefou committed Sep 10, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit db2299cad73121e9dcdb38c040f6ebe6a961205f
6 changes: 5 additions & 1 deletion build.mill
Original file line number Diff line number Diff line change
@@ -522,6 +522,11 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima {
),
ProblemFilter.exclude[InheritedNewAbstractMethodProblem](
"mill.main.MainModule.mill$define$BaseModule0$_setter_$evalWatchedValues_="
),

// https://github.com/com-lihaoyi/mill/pull/3503
ProblemFilter.exclude[ReversedMissingMethodProblem](
"mill.scalalib.ScalaModule#ScalaTests.mill$scalalib$ScalaModule$ScalaTests$$super$mandatoryScalacOptions"
)
)
def mimaPreviousVersions: T[Seq[String]] = Settings.mimaBaseVersions
@@ -875,7 +880,6 @@ object dist extends MillPublishJavaModule {
}
}


/**
* Build and install Mill locally.
*
2 changes: 1 addition & 1 deletion scalalib/src/mill/scalalib/ScalaModule.scala
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
override def scalacPluginIvyDeps: Target[Agg[Dep]] = outer.scalacPluginIvyDeps()
override def scalacPluginClasspath: Target[Agg[PathRef]] = outer.scalacPluginClasspath()
override def scalacOptions: Target[Seq[String]] = outer.scalacOptions()
override def mandatoryScalacOptions: Target[Seq[String]] = outer.mandatoryScalacOptions()
override def mandatoryScalacOptions: Target[Seq[String]] = T{ super.mandatoryScalacOptions() }
}

/**