diff options
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -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"), |