From 3f485634f52e7eb069bae8a64eacc86042a39d38 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Tue, 11 Jan 2022 21:16:34 -0800 Subject: Set mimaPreviousArtifacts for binary compatibility checking --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 7cad3e6d..b9406c8f 100644 --- a/build.sbt +++ b/build.sbt @@ -134,7 +134,7 @@ lazy val plugin = (project in file("plugin")). ). settings( mimaPreviousArtifacts := { - Set() + Set("edu.berkeley.cs" % "chisel3-plugin" % "3.5.0" cross CrossVersion.full) } ) @@ -153,7 +153,7 @@ lazy val macros = (project in file("macros")). settings(name := "chisel3-macros"). settings(commonSettings: _*). settings(publishSettings: _*). - settings(mimaPreviousArtifacts := Set()) + settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-macros" % "3.5.0")) lazy val firrtlRef = ProjectRef(workspaceDirectory / "firrtl", "firrtl") @@ -167,7 +167,7 @@ lazy val core = (project in file("core")). buildInfoKeys := Seq[BuildInfoKey](buildInfoPackage, version, scalaVersion, sbtVersion) ). settings(publishSettings: _*). - settings(mimaPreviousArtifacts := Set()). + settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-core" % "3.5.0")). settings( name := "chisel3-core", scalacOptions := scalacOptions.value ++ Seq( @@ -196,7 +196,7 @@ lazy val chisel = (project in file(".")). dependsOn(core). aggregate(macros, core, plugin). settings( - mimaPreviousArtifacts := Set(), + mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3" % "3.5.0"), libraryDependencies += defaultVersions("treadle") % "test", scalacOptions in Test ++= Seq("-language:reflectiveCalls"), scalacOptions in Compile in doc ++= Seq( -- cgit v1.2.3 From ea1ced34b5c9e42412cc0ac3e7431cd3194ccbc3 Mon Sep 17 00:00:00 2001 From: mergify[bot] Date: Tue, 1 Feb 2022 19:56:13 +0000 Subject: Chisel plugin bundle elements handler (#2306) (#2380) Adds generation of `Bundle.elements` method to the chores done by the compiler plugin For each `Bundle` find the relevant visible Chisel field members and construct a hard-coded list of the elements and their names implemented as `_elementsImpl` For more details: See plugins/README.md - Should be no change in API - Handles inheritance and mixins - Handles Seq[Data] - Tests in BundleElementSpec Co-authored-by: chick Co-authored-by: Jack Koenig (cherry picked from commit 237200a420581519f29149cbae9b3e968c0d01fc) Co-authored-by: Chick Markley --- build.sbt | 1 + 1 file changed, 1 insertion(+) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index b9406c8f..f5f178fd 100644 --- a/build.sbt +++ b/build.sbt @@ -198,6 +198,7 @@ lazy val chisel = (project in file(".")). settings( mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3" % "3.5.0"), libraryDependencies += defaultVersions("treadle") % "test", + Test / scalacOptions += "-P:chiselplugin:genBundleElements", scalacOptions in Test ++= Seq("-language:reflectiveCalls"), scalacOptions in Compile in doc ++= Seq( "-diagrams", -- cgit v1.2.3 From 0eba2eb109910c1e4b980ccfc7f3ae85a8d0f223 Mon Sep 17 00:00:00 2001 From: mergify[bot] Date: Tue, 1 Feb 2022 21:37:08 +0000 Subject: Improve error reporting (backport #2376) (#2379) * Improve error reporting (#2376) * Do not trim stack traces of exceptions with no stack trace This prevents us from accidentally giving stack traces to exceptions that don't have them and giving misleading messages telling users to use --full-stacktrace when it won't actually do anything. Also deprecate ChiselException.chiselStackTrace which is no longer being used anywhere in this codebase. * Add exception class for multiple-errors reported New chisel3.internal.Errors replaces old anonymous class that would show up as chisel3.internal.ErrorLog$$anon$1 in error messages. * Add new option --throw-on-first-error This tells Chisel not to aggregate recoverable errors but instead to throw an exception on the first one. This gives a stack trace for users who need it for debugging. (cherry picked from commit ff2e9c92247b3848659fa09fdd53ddde2120036a) * Waive MiMa false positives The waived change is to a package private constructor. Co-authored-by: Jack Koenig Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- build.sbt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index f5f178fd..e63496a5 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,7 @@ // See LICENSE for license details. +import com.typesafe.tools.mima.core._ + enablePlugins(SiteScaladocPlugin) val defaultVersions = Map( @@ -197,6 +199,10 @@ lazy val chisel = (project in file(".")). aggregate(macros, core, plugin). settings( mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3" % "3.5.0"), + mimaBinaryIssueFilters ++= Seq( + // Modified package private methods (https://github.com/lightbend/mima/issues/53) + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.stage.ChiselOptions.this"), + ), libraryDependencies += defaultVersions("treadle") % "test", Test / scalacOptions += "-P:chiselplugin:genBundleElements", scalacOptions in Test ++= Seq("-language:reflectiveCalls"), -- cgit v1.2.3 From f5c51d7de7b5fca48106d117b9e4ac2ee488f334 Mon Sep 17 00:00:00 2001 From: mergify[bot] Date: Wed, 2 Feb 2022 01:13:30 +0000 Subject: Add Scala 2.13.8 to plugin cross-compilation (#2385) (#2386) (cherry picked from commit 551854b223954f359156582c4219948dbb328857) Co-authored-by: Jack Koenig --- build.sbt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index e63496a5..4fe7122f 100644 --- a/build.sbt +++ b/build.sbt @@ -116,7 +116,8 @@ lazy val pluginScalaVersions = Seq( "2.13.4", "2.13.5", "2.13.6", - "2.13.7" + "2.13.7", + "2.13.8" ) lazy val plugin = (project in file("plugin")). -- cgit v1.2.3