From aec9e9e61f9b6775bf313601ec5a44a34f608609 Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Tue, 26 Jan 2021 11:14:33 -0800 Subject: Fix post-merge publishing (#2055) * Check Unidoc on all versions of Scala It is required for publishing and we publish every version * Fix conflicting cross-version suffixes issue When running `sbt ++2.13.4 unidoc`, SBT would set the Scala version for the fuzzer and benchmark projects even though they aren't really relevant to the command. This may be a misconfiguration or a bug in the unidoc plugin. Whatever the case, simply making it possible for them to use the same version of Scala as the firrtl project (on which they depend) fixes the issue. * Match versions of Scala in build.sbt and CI * Fix unidoc issues in 2.13.4 There is some bug in ScalaDoc not finding some links in firrtl.options so those links were made absolute as a workaround.--- build.sbt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index e2c0b19e..76908bb7 100644 --- a/build.sbt +++ b/build.sbt @@ -16,13 +16,15 @@ def javacOptionsVersion(scalaVersion: String): Seq[String] = { } } - lazy val commonSettings = Seq( organization := "edu.berkeley.cs", + scalaVersion := "2.12.13", + crossScalaVersions := Seq("2.13.4", "2.12.13", "2.11.12") +) + +lazy val firrtlSettings = Seq( name := "firrtl", version := "1.5-SNAPSHOT", - scalaVersion := "2.12.13", - crossScalaVersions := Seq("2.13.4", "2.12.13", "2.11.12"), addCompilerPlugin(scalafixSemanticdb), scalacOptions := Seq( "-deprecation", @@ -170,6 +172,7 @@ lazy val firrtl = (project in file(".")) Test / testForkedParallel := true ) .settings(commonSettings) + .settings(firrtlSettings) .settings(protobufSettings) .settings(antlrSettings) .settings(assemblySettings) @@ -187,6 +190,7 @@ lazy val firrtl = (project in file(".")) lazy val benchmark = (project in file("benchmark")) .dependsOn(firrtl) + .settings(commonSettings) .settings( assemblyJarName in assembly := "firrtl-benchmark.jar", test in assembly := {}, @@ -196,6 +200,7 @@ lazy val benchmark = (project in file("benchmark")) val JQF_VERSION = "1.5" lazy val jqf = (project in file("jqf")) + .settings(commonSettings) .settings( libraryDependencies ++= Seq( "edu.berkeley.cs.jqf" % "jqf-fuzz" % JQF_VERSION, @@ -221,6 +226,7 @@ lazy val testClassAndMethodParser = { lazy val fuzzer = (project in file("fuzzer")) .dependsOn(firrtl) + .settings(commonSettings) .settings( libraryDependencies ++= Seq( "com.pholser" % "junit-quickcheck-core" % "0.8", -- cgit v1.2.3