Skip to content

Commit

Permalink
fix: fix wrong mill source layout
Browse files Browse the repository at this point in the history
Trait HasScala2Plugin and HasScala2MacroAnno extending CrossSbtModule
will override the mill sources with SBT's folder layout and it will
break the modules with mill's default source layout like LitUtility
and PanamaConverter.

Signed-off-by: unlsycn <unlsycn@unlsycn.com>
  • Loading branch information
unlsycn committed Nov 16, 2024
1 parent 97514bb commit f1b7380
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@ trait ChiselPublishModule extends CiReleaseModule {

}

trait HasScala2MacroAnno extends CrossSbtModule {
trait HasScala2MacroAnno extends CrossModuleBase {
override def scalacOptions = T {
if (!v.isScala3(crossScalaVersion)) {
super.scalacOptions() ++ Agg("-Ymacro-annotations")
} else super.scalacOptions()
}
}

trait HasScala2Plugin extends CrossSbtModule {
trait HasScala2Plugin extends CrossModuleBase {
def pluginModule: Plugin

override def scalacOptions = T {
Expand Down

0 comments on commit f1b7380

Please sign in to comment.