From 90e4ac38d49a9bae2bda1990c5de911c51c8c72a Mon Sep 17 00:00:00 2001
From: mergify[bot]
Date: Tue, 20 Sep 2022 17:56:53 +0000
Subject: Bump to Scala 2.13.9 and 2.12.17 (backport #2739) (#2740)

* Bump to Scala 2.13.9 and 2.12.17 (#2739)

(cherry picked from commit 647c8a458ebc89ae3df818d540d308f0c417ae9f)

# Conflicts:
#	.github/workflows/test.yml

* Resolve backport conflicts

* Update mimaPreviousArtifacts

Co-authored-by: Jack Koenig <koenig@sifive.com>---
 build.sc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sc')

diff --git a/build.sc b/build.sc
index d7dbc6d7..9e46098c 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.9", "2.12.17")
 
 // The following stanza is searched for and used when preparing releases.
 // Please retain it.
-- 
cgit v1.2.3


From 1e9f4e99167d1bc132a1a1a04e6987c2161c4d0e Mon Sep 17 00:00:00 2001
From: mergify[bot]
Date: Thu, 13 Oct 2022 21:25:07 +0000
Subject: Bump to Scala 2.13.10 (backport #2774) (#2775)

* Bump to Scala 2.13.10 (#2774)

2.13.9 has a binary compatibility regression so should be avoided.

(cherry picked from commit c53265d6853728280b6bc01b001415166515c79a)

# Conflicts:
#	.github/workflows/test.yml

* Fix backport conflicts

* Fix scalaVersion in README

* Waive binary compatibility check for plugin for 2.13.10

3.5.4 is published for 2.13.10 so we cannot check binary compatibility
for it.

Co-authored-by: Jack Koenig <koenig@sifive.com>---
 build.sc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sc')

diff --git a/build.sc b/build.sc
index 9e46098c..80ba17fe 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.9", "2.12.17")
+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.
-- 
cgit v1.2.3


From 2f890aabc1ecf04c6efcb84cee4f00da67be6a53 Mon Sep 17 00:00:00 2001
From: mergify[bot]
Date: Tue, 25 Oct 2022 01:58:03 +0000
Subject: Add Scalafmt for mill (backport #2805) (#2807)

* Add Scalafmt for mill (#2805)

* add scalafmt for test in mill build system.
* reformat codes in integration-tests

(cherry picked from commit d881fd29d7af91a7c514565b4b21797f1e44fbdb)

# Conflicts:
#	build.sc
#	integration-tests/src/test/scala/chiselTests/util/experimental/BitPat.scala

* Resolve backport conflicts

Co-authored-by: Jiuyang Liu <liu@jiuyang.me>
Co-authored-by: Jack Koenig <koenig@sifive.com>---
 build.sc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sc')

diff --git a/build.sc b/build.sc
index 80ba17fe..f7bd1c9b 100644
--- a/build.sc
+++ b/build.sc
@@ -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 {
-- 
cgit v1.2.3