From 73d3e3cf0722f712f3f950980253290481de5db7 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Fri, 13 May 2022 16:53:39 -0700 Subject: Update mimaPreviousArtifacts to 3.5.3 (#2529) --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 4fe7122f..7242bb6e 100644 --- a/build.sbt +++ b/build.sbt @@ -137,7 +137,7 @@ lazy val plugin = (project in file("plugin")). ). settings( mimaPreviousArtifacts := { - Set("edu.berkeley.cs" % "chisel3-plugin" % "3.5.0" cross CrossVersion.full) + Set("edu.berkeley.cs" % "chisel3-plugin" % "3.5.3" cross CrossVersion.full) } ) @@ -156,7 +156,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.0")) + settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-macros" % "3.5.3")) lazy val firrtlRef = ProjectRef(workspaceDirectory / "firrtl", "firrtl") @@ -170,7 +170,7 @@ lazy val core = (project in file("core")). buildInfoKeys := Seq[BuildInfoKey](buildInfoPackage, version, scalaVersion, sbtVersion) ). settings(publishSettings: _*). - settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-core" % "3.5.0")). + settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-core" % "3.5.3")). settings( name := "chisel3-core", scalacOptions := scalacOptions.value ++ Seq( @@ -199,7 +199,7 @@ lazy val chisel = (project in file(".")). dependsOn(core). aggregate(macros, core, plugin). settings( - mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3" % "3.5.0"), + mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3" % "3.5.3"), mimaBinaryIssueFilters ++= Seq( // Modified package private methods (https://github.com/lightbend/mima/issues/53) ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.stage.ChiselOptions.this"), -- cgit v1.2.3 From d001b34f816f1f65d0625aebf33e5cfc5ba93e49 Mon Sep 17 00:00:00 2001 From: mergify[bot] Date: Thu, 16 Jun 2022 23:15:42 +0000 Subject: Define leading '_' as API for creating temporaries (backport #2580) (#2581) * Define leading '_' as API for creating temporaries Chisel and FIRRTL have long used signals with names beginning with an underscore as an API to specify that the name does not really matter. Tools like Verilator follow a similar convention and exclude signals with underscore names from waveform dumps by default. With the introduction of compiler-plugin prefixing in Chisel 3.4, the convention remained but was hard for users to use unless the unnnamed signal existed outside of any prefix domain. Notably, unnamed signals are most useful when creating wires inside of utility methods which almost always results in the signal ending up with a prefix. With this commit, Chisel explicitly recognizes signals whos val names start with an underscore and preserve that underscore regardless of any prefixing. Chisel will also ignore such underscores when generating prefixes based on the temporary signal, preventing accidental double underscores in the names of signals that are prefixed by the temporary. (cherry picked from commit bd94366290886f3489d58f88b9768c7c11fa2cb6) * Remove unused defaultPrefix argument from _computeName (cherry picked from commit ec178aa20a830df2c8c756b9e569709a59073554) # Conflicts: # core/src/main/scala/chisel3/Module.scala # core/src/main/scala/chisel3/experimental/hierarchy/ModuleClone.scala * Resolve backport conflicts * Waive false positive binary compatibility errors Co-authored-by: Jack Koenig --- build.sbt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 7242bb6e..c3d25a09 100644 --- a/build.sbt +++ b/build.sbt @@ -170,7 +170,20 @@ lazy val core = (project in file("core")). buildInfoKeys := Seq[BuildInfoKey](buildInfoPackage, version, scalaVersion, sbtVersion) ). settings(publishSettings: _*). - settings(mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-core" % "3.5.3")). + settings( + mimaPreviousArtifacts := Set("edu.berkeley.cs" %% "chisel3-core" % "3.5.3"), + mimaBinaryIssueFilters ++= Seq( + // Modified package private methods (https://github.com/lightbend/mima/issues/53) + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.Data._computeName"), + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.Data.forceName"), + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.MemBase._computeName"), + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.MemBase.forceName"), + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.VerificationStatement._computeName"), + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.VerificationStatement.forceName"), + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.experimental.BaseModule._computeName"), + ProblemFilters.exclude[DirectMissingMethodProblem]("chisel3.experimental.BaseModule.forceName"), + ) + ). settings( name := "chisel3-core", scalacOptions := scalacOptions.value ++ Seq( -- cgit v1.2.3 From 7fc023cd2983cc22a309636d3cd7e0d9066cd805 Mon Sep 17 00:00:00 2001 From: mergify[bot] Date: Thu, 23 Jun 2022 19:57:26 +0000 Subject: Publish unidoc as ScalaDoc in chisel project (backport #2595) (#2598) * Publish unidoc as ScalaDoc in chisel project (#2595) This makes it such that we can stop hosting ScalaDoc on the Chisel website, instead just pointing to the latest docs on javadoc.io (cherry picked from commit 8b9f3d78ea23d9d9f0a118d1a2c30478ca2ff2f9) # Conflicts: # build.sbt * Resolve backport conflicts Co-authored-by: Jack Koenig Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>--- build.sbt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index c3d25a09..a287fee9 100644 --- a/build.sbt +++ b/build.sbt @@ -219,6 +219,10 @@ lazy val chisel = (project in file(".")). ), libraryDependencies += defaultVersions("treadle") % "test", Test / scalacOptions += "-P:chiselplugin:genBundleElements", + // Forward doc command to unidoc + Compile / doc := (ScalaUnidoc / doc).value, + // Include unidoc as the ScalaDoc for publishing + Compile / packageDoc / mappings := (ScalaUnidoc / packageDoc / mappings).value, scalacOptions in Test ++= Seq("-language:reflectiveCalls"), scalacOptions in Compile in doc ++= Seq( "-diagrams", -- cgit v1.2.3 From c247be3fd94084cc21b5891c422319e103b47074 Mon Sep 17 00:00:00 2001 From: mergify[bot] Date: Tue, 12 Jul 2022 22:54:55 +0000 Subject: 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 (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 --- build.sbt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'build.sbt') 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) + } } ) -- cgit v1.2.3 From bced77045c8fc5db37e40b159c49220929e15d46 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Sat, 30 Jul 2022 14:14:57 -0700 Subject: Remove chiseltest from defaultVersions (#2651) Release automation tries to bump chiseltest which causes issues due to SBT trying to resolve all dependencies (even for projects that will not be published, like integrationTests).--- build.sbt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index a0814521..fb9ca94b 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,10 @@ enablePlugins(SiteScaladocPlugin) val defaultVersions = Map( "firrtl" -> "edu.berkeley.cs" %% "firrtl" % "1.5-SNAPSHOT", "treadle" -> "edu.berkeley.cs" %% "treadle" % "1.5-SNAPSHOT", - "chiseltest" -> "edu.berkeley.cs" %% "chiseltest" % "0.5-SNAPSHOT", + // chiseltest intentionally excluded so that release automation does not try to set its version + // The projects using chiseltest are not published, but SBT resolves dependencies for all projects + // when doing publishing and will not find a chiseltest release since chiseltest depends on + // chisel3 ) lazy val commonSettings = Seq ( @@ -265,7 +268,7 @@ lazy val integrationTests = (project in file ("integration-tests")). settings(chiselSettings: _*). settings(usePluginSettings: _*). settings(Seq( - libraryDependencies += defaultVersions("chiseltest") % "test", + libraryDependencies += "edu.berkeley.cs" %% "chiseltest" % "0.5-SNAPSHOT" % "test" )) lazy val docs = project // new documentation project -- cgit v1.2.3