Update build.sc

adkian-sifive · adkian-sifive · commit c2255130bfb2 · 2024-12-04T08:20:17.000-08:00
diff --git a/build.sc b/build.sc
@@ -38,6 +38,7 @@ object v extends Module {
   }
 
   val scalaCrossVersions = Seq(
+    "3.3.3",
     "2.13.15"
   )
 
@@ -251,7 +252,7 @@ trait Core extends CrossSbtModule with HasScala2MacroAnno with ScalafmtModule {
   )
 
   override def ivyDeps = if (v.isScala3(crossScalaVersion)) {
-    super.ivyDeps() ++ commonDeps
+    super.ivyDeps() ++ commonDeps ++ Agg(v.firtoolResolver.withDottyCompat(scalaVersion()))
   } else {
     super.ivyDeps() ++ commonDeps ++ Agg(v.firtoolResolver)
   }
@@ -313,7 +314,7 @@ trait Plugin extends CrossSbtModule with ScalafmtModule with ChiselPublishModule
 }
 
 object chisel extends Cross[Chisel](v.scalaCrossVersions)
-trait Chisel extends CrossSbtModule with HasScala2MacroAnno with HasScala2Plugin with ScalafmtModule {
+trait Chisel extends CrossSbtModule with HasScala2MacroAnno with ScalafmtModule {
   override def millSourcePath = super.millSourcePath / os.up
   def svsimModule = svsim(crossScalaVersion)
   def coreModule = core(crossScalaVersion)

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ object v extends Module {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`val scalaCrossVersions = Seq(`
	`41`	`+ "3.3.3",`
`41`	`42`	`"2.13.15"`
`42`	`43`	`)`
`43`	`44`
`@@ -251,7 +252,7 @@ trait Core extends CrossSbtModule with HasScala2MacroAnno with ScalafmtModule {`
`251`	`252`	`)`
`252`	`253`
`253`	`254`	`override def ivyDeps = if (v.isScala3(crossScalaVersion)) {`
`254`		`- super.ivyDeps() ++ commonDeps`
	`255`	`+ super.ivyDeps() ++ commonDeps ++ Agg(v.firtoolResolver.withDottyCompat(scalaVersion()))`
`255`	`256`	`} else {`
`256`	`257`	`super.ivyDeps() ++ commonDeps ++ Agg(v.firtoolResolver)`
`257`	`258`	`}`
`@@ -313,7 +314,7 @@ trait Plugin extends CrossSbtModule with ScalafmtModule with ChiselPublishModule`
`313`	`314`	`}`
`314`	`315`
`315`	`316`	`object chisel extends Cross[Chisel](v.scalaCrossVersions)`
`316`		`-trait Chisel extends CrossSbtModule with HasScala2MacroAnno with HasScala2Plugin with ScalafmtModule {`
	`317`	`+trait Chisel extends CrossSbtModule with HasScala2MacroAnno with ScalafmtModule {`
`317`	`318`	`override def millSourcePath = super.millSourcePath / os.up`
`318`	`319`	`def svsimModule = svsim(crossScalaVersion)`
`319`	`320`	`def coreModule = core(crossScalaVersion)`