Merge branch '3.5.x' into 3.5-release

1 files changed, 2 insertions, 2 deletions

diff --git a/build.sc b/build.sc
index 3e47ed44..cc853f59 100644
--- a/build.sc
+++ b/build.sc
@@ -6,7 +6,7 @@ import coursier.maven.MavenRepository
 import $ivy.`com.lihaoyi::mill-contrib-buildinfo:$MILL_VERSION`
 import mill.contrib.buildinfo.BuildInfo
 
-object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.6", "2.12.14")
+object chisel3 extends mill.Cross[chisel3CrossModule]("2.13.10", "2.12.17")
 
 // The following stanza is searched for and used when preparing releases.
 // Please retain it.
@@ -104,7 +104,7 @@ class chisel3CrossModule(val crossScalaVersion: String) extends CommonModule wit
     )
   }
 
-  object test extends Tests {
+  object test extends Tests with ScalafmtModule {
     override def scalacPluginClasspath = m.scalacPluginClasspath
 
     override  def scalacOptions = T {