summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authormergify[bot]2022-07-12 22:54:55 +0000
committerGitHub2022-07-12 22:54:55 +0000
commitc247be3fd94084cc21b5891c422319e103b47074 (patch)
tree90f1fb16421a968d60d146b1bb323e3c0657e23d /build.sbt
parent94aeeb1a5c2fe38777a9004ba36f8b353e96b292 (diff)
Update scala-compiler, scala-library, ... to 2.12.16 (backport #2618) (#2624)
* Update scala-compiler, scala-library, ... to 2.12.16 (#2618) * Update scala-compiler, scala-library, ... to 2.12.16 * Add 2.12.16 to compiler plugin crossbuild Co-authored-by: Jack Koenig <jack.koenig3@gmail.com> (cherry picked from commit e4f663574b740164f4f49c0e31cb12c69dce5beb) # Conflicts: # .github/workflows/test.yml * Resolve backport conflicts * Ignore lack of plugin 3.5.3 artifact for Scala 2.12.16 Since 2.12.16 did not exist when 3.5.3 was published, there is no artifact for the plugin so we must ignore it until 3.5.4 is released. Co-authored-by: Scala Steward <43047562+scala-steward@users.noreply.github.com> Co-authored-by: Jack Koenig <koenig@sifive.com>
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt12
1 files changed, 9 insertions, 3 deletions
diff --git a/build.sbt b/build.sbt
index a287fee9..a0814521 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,8 +18,8 @@ lazy val commonSettings = Seq (
organization := "edu.berkeley.cs",
version := "3.5-SNAPSHOT",
autoAPIMappings := true,
- scalaVersion := "2.12.15",
- crossScalaVersions := Seq("2.13.6", "2.12.15"),
+ scalaVersion := "2.12.16",
+ crossScalaVersions := Seq("2.13.6", "2.12.16"),
scalacOptions := Seq("-deprecation", "-feature"),
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
// Macros paradise is integrated into 2.13 but requires a scalacOption
@@ -109,6 +109,7 @@ lazy val pluginScalaVersions = Seq(
"2.12.13",
"2.12.14",
"2.12.15",
+ "2.12.16",
"2.13.0",
"2.13.1",
"2.13.2",
@@ -137,7 +138,12 @@ lazy val plugin = (project in file("plugin")).
).
settings(
mimaPreviousArtifacts := {
- Set("edu.berkeley.cs" % "chisel3-plugin" % "3.5.3" cross CrossVersion.full)
+ // There is not yet a 2.12.16 artifact, so suppress until 3.5.4 is released
+ if (scalaVersion.value == "2.12.16") {
+ Set()
+ } else {
+ Set("edu.berkeley.cs" % "chisel3-plugin" % "3.5.3" cross CrossVersion.full)
+ }
}
)