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

Always resolve compiler bridge in prepareOffline #2791

Merged
merged 1 commit into from
Sep 28, 2023
Merged

Always resolve compiler bridge in prepareOffline #2791

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
18 changes: 8 additions & 10 deletions scalalib/src/mill/scalalib/ScalaModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,21 +481,14 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
*/
@nowarn("msg=pure expression does nothing")
override def prepareOffline(all: Flag): Command[Unit] = {
val ammonite = resolvedAmmoniteReplIvyDeps
val tasks =
if (all.value) Seq(
resolvedAmmoniteReplIvyDeps,
T.task {
zincWorker().scalaCompilerBridgeJar(
scalaVersion(),
scalaOrganization(),
repositoriesTask()
)
}
)
if (all.value) Seq(ammonite)
else Seq()

T.command {
super.prepareOffline(all)()
// resolve the compile bridge jar
resolveDeps(T.task {
val bind = bindDependency()
scalacPluginIvyDeps().map(bind)
Expand All @@ -504,6 +497,11 @@ trait ScalaModule extends JavaModule with TestModule.ScalaModuleBase { outer =>
val bind = bindDependency()
scalaDocPluginIvyDeps().map(bind)
})()
zincWorker().scalaCompilerBridgeJar(
scalaVersion(),
scalaOrganization(),
repositoriesTask()
)
T.sequence(tasks)()
()
}
Expand Down