fix: fix wrong mill source layout (#4511)

unlsycn · web-flow · commit 32fa608d1129 · 2024-11-16T20:04:35.000-08:00
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 &lt;unlsycn@unlsycn.com&gt;
diff --git a/build.sc b/build.sc
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -119,15 +119,15 @@ trait ChiselPublishModule extends CiReleaseModule {`
`119`	`119`
`120`	`120`	`}`
`121`	`121`
`122`		`-trait HasScala2MacroAnno extends CrossSbtModule {`
	`122`	`+trait HasScala2MacroAnno extends CrossModuleBase {`
`123`	`123`	`override def scalacOptions = T {`
`124`	`124`	`if (!v.isScala3(crossScalaVersion)) {`
`125`	`125`	`super.scalacOptions() ++ Agg("-Ymacro-annotations")`
`126`	`126`	`} else super.scalacOptions()`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`130`		`-trait HasScala2Plugin extends CrossSbtModule {`
	`130`	`+trait HasScala2Plugin extends CrossModuleBase {`
`131`	`131`	`def pluginModule: Plugin`
`132`	`132`
`133`	`133`	`override def scalacOptions = T {`