From 8c01e8ced10944db212aaa7939bfa2cab28ab02b Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Tue, 24 Mar 2020 16:17:44 -0400 Subject: Don't use postfix operator in transforms.Flatten Signed-off-by: Schuyler Eldridge --- src/main/scala/firrtl/transforms/Flatten.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/firrtl/transforms/Flatten.scala b/src/main/scala/firrtl/transforms/Flatten.scala index 26d2b06d..68cfa3d0 100644 --- a/src/main/scala/firrtl/transforms/Flatten.scala +++ b/src/main/scala/firrtl/transforms/Flatten.scala @@ -47,7 +47,7 @@ class Flatten extends Transform { * @return modified circuit and ModuleNames to inline */ def duplicateSubCircuitsFromAnno(c: Circuit, mods: Set[ModuleName], insts: Set[ComponentName]): (Circuit, Set[ModuleName]) = { - val modMap = c.modules.map(m => m.name->m) toMap + val modMap = c.modules.map(m => m.name->m).toMap val seedMods = mutable.Map.empty[String, String] val newModDefs = mutable.Set.empty[DefModule] val nsp = Namespace(c) -- cgit v1.2.3 From 331e5bcbbc69e2ed16750a25f83de99d3c8a2b29 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Mon, 30 Mar 2020 13:51:06 -0400 Subject: Switch to 3.0.0 sbt-apimappings Signed-off-by: Schuyler Eldridge --- build.sbt | 12 ------------ project/plugins.sbt | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build.sbt b/build.sbt index 8cdedb27..16ef8517 100644 --- a/build.sbt +++ b/build.sbt @@ -132,18 +132,6 @@ lazy val publishSettings = Seq( lazy val docSettings = Seq( doc in Compile := (doc in ScalaUnidoc).value, autoAPIMappings := true, - apiMappings ++= { - Option(System.getProperty("sun.boot.class.path")).flatMap { classPath => - classPath.split(java.io.File.pathSeparator).find(_.endsWith(java.io.File.separator + "rt.jar")) - }.map { jarPath => - Map( - file(jarPath) -> url("https://docs.oracle.com/javase/8/docs/api") - ) - }.getOrElse { - streams.value.log.warn("Failed to add bootstrap class path of Java to apiMappings") - Map.empty[File,URL] - } - }, scalacOptions in Compile in doc ++= Seq( "-diagrams", "-diagrams-max-classes", "25", diff --git a/project/plugins.sbt b/project/plugins.sbt index 2ce9aa89..d4de9ef5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -22,4 +22,6 @@ addSbtPlugin("com.github.gseitz" % "sbt-protobuf" % "0.6.5") addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.12") +addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") + libraryDependencies += "com.github.os72" % "protoc-jar" % "3.11.1" -- cgit v1.2.3 From 4f98ede27f5724274d0a9329e3de483c4b74b27c Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Tue, 24 Mar 2020 16:18:18 -0400 Subject: Nuclear option for documentation building Turn on -Xfatal-warnings when building documentation. Signed-off-by: Schuyler Eldridge --- build.sbt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.sbt b/build.sbt index 16ef8517..88d22088 100644 --- a/build.sbt +++ b/build.sbt @@ -39,6 +39,9 @@ lazy val commonSettings = Seq( scalacOptions := scalacOptionsVersion(scalaVersion.value) ++ Seq( "-deprecation", "-unchecked", + "-language:reflectiveCalls", + "-language:existentials", + "-language:implicitConversions", "-Yrangepos", // required by SemanticDB compiler plugin "-Ywarn-unused-import" // required by `RemoveUnused` rule ), @@ -133,6 +136,8 @@ lazy val docSettings = Seq( doc in Compile := (doc in ScalaUnidoc).value, autoAPIMappings := true, scalacOptions in Compile in doc ++= Seq( + "-Xfatal-warnings", + "-feature", "-diagrams", "-diagrams-max-classes", "25", "-doc-version", version.value, -- cgit v1.2.3 From d3b3f8c2498c564b4f021bd2115b006564ca4f99 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Tue, 24 Mar 2020 16:19:17 -0400 Subject: Add Unidoc build to Travis CI Signed-off-by: Schuyler Eldridge --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9e552319..404c12ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,10 @@ jobs: - verilator --version - bash .install_yosys.sh - yosys -V + - stage: test + name: "Unidoc builds (no warnings)" + script: + - sbt $SBT_ARGS unidoc - stage: test name: "Tests: FIRRTL (2.12)" script: -- cgit v1.2.3