diff options
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | build.sbt | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c0249269..f1fa715d 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.15"] + scala: ["2.13.6", "2.12.16"] espresso: ["2.4"] runs-on: ${{ matrix.system }} @@ -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) + } } ) |