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>---
 .github/workflows/test.yml |  2 +-
 build.sbt                  | 21 ++++++++++++---------
 build.sc                   |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f1fa715d..bd27edb9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         system: ["ubuntu-20.04"]
         jvm: ["adopt@1.8"]
-        scala: ["2.13.6", "2.12.16"]
+        scala: ["2.13.9", "2.12.17"]
         espresso: ["2.4"]
     runs-on: ${{ matrix.system }}
 
diff --git a/build.sbt b/build.sbt
index d9acadff..36102074 100644
--- a/build.sbt
+++ b/build.sbt
@@ -21,8 +21,8 @@ lazy val commonSettings = Seq (
   organization := "edu.berkeley.cs",
   version := "3.5-SNAPSHOT",
   autoAPIMappings := true,
-  scalaVersion := "2.12.16",
-  crossScalaVersions := Seq("2.13.6", "2.12.16"),
+  scalaVersion := "2.12.17",
+  crossScalaVersions := Seq("2.13.9", "2.12.17"),
   scalacOptions := Seq("-deprecation", "-feature"),
   libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
   // Macros paradise is integrated into 2.13 but requires a scalacOption
@@ -113,6 +113,7 @@ lazy val pluginScalaVersions = Seq(
   "2.12.14",
   "2.12.15",
   "2.12.16",
+  "2.12.17",
   "2.13.0",
   "2.13.1",
   "2.13.2",
@@ -121,7 +122,8 @@ lazy val pluginScalaVersions = Seq(
   "2.13.5",
   "2.13.6",
   "2.13.7",
-  "2.13.8"
+  "2.13.8",
+  "2.13.9"
 )
 
 lazy val plugin = (project in file("plugin")).
@@ -141,11 +143,12 @@ lazy val plugin = (project in file("plugin")).
   ).
   settings(
     mimaPreviousArtifacts := {
-      // There is not yet a 2.12.16 artifact, so suppress until 3.5.4 is released
-      if (scalaVersion.value == "2.12.16") {
+      // There is not yet a 2.12.17 nor 2.13.9 artifact, so suppress until 3.5.5 is released
+      val skipVersions = Seq("2.12.17", "2.13.9")
+      if (skipVersions.contains(scalaVersion.value)) {
         Set()
       } else {
-        Set("edu.berkeley.cs" % "chisel3-plugin" % "3.5.3" cross CrossVersion.full)
+        Set("edu.berkeley.cs" % "chisel3-plugin" % "3.5.4" cross CrossVersion.full)
       }
     }
   )
@@ -165,7 +168,7 @@ lazy val macros = (project in file("macros")).
   settings(name := "chisel3-macros").
   settings(commonSettings: _*).
   settings(publishSettings: _*).
-  settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-macros" % "3.5.3"))
+  settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-macros" % "3.5.4"))
 
 lazy val firrtlRef = ProjectRef(workspaceDirectory / "firrtl", "firrtl")
 
@@ -180,7 +183,7 @@ lazy val core = (project in file("core")).
   ).
   settings(publishSettings: _*).
   settings(
-    mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-core" % "3.5.3"),
+    mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-core" % "3.5.4"),
     mimaBinaryIssueFilters ++= Seq(
       // Modified package private methods (https://github.com/lightbend/mima/issues/53)
       ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.Data._computeName"),
@@ -226,7 +229,7 @@ lazy val chisel = (project in file(".")).
   dependsOn(core).
   aggregate(macros, core, plugin).
   settings(
-    mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3" % "3.5.3"),
+    mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3" % "3.5.4"),
     mimaBinaryIssueFilters ++= Seq(
       // Modified package private methods (https://github.com/lightbend/mima/issues/53)
       ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.stage.ChiselOptions.this"),
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