Skip to content

Commit 48c0322

Browse files
authored
Update deprecated code in build.sbt (#648)
1 parent 794812f commit 48c0322

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

build.sbt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ lazy val chiselSettings = Seq (
6565
</developer>
6666
</developers>,
6767

68-
publishTo <<= version { v: String =>
68+
publishTo := {
69+
val v = version.value
6970
val nexus = "https://oss.sonatype.org/"
7071
if (v.trim.endsWith("SNAPSHOT")) {
7172
Some("snapshots" at nexus + "content/repositories/snapshots")
@@ -90,11 +91,6 @@ lazy val chiselSettings = Seq (
9091
parallelExecution in Test := true,
9192

9293
javacOptions ++= Seq("-target", "1.7")
93-
// Hopefully we get these options back in Chisel3
94-
// scalacOptions in (Compile, doc) <++= (baseDirectory in LocalProject("chisel"), version) map { (bd, v) =>
95-
// Seq("-diagrams", "-diagrams-max-classes", "25", "-sourcepath", bd.getAbsolutePath, "-doc-source-url",
96-
// "https://github.com/ucb-bar/chisel/tree/master/€{FILE_PATH}.scala")
97-
// }
9894
)
9995

10096
lazy val coreMacros = (project in file("coreMacros")).
@@ -134,10 +130,10 @@ lazy val chisel = (project in file(".")).
134130
),
135131
aggregate in doc := false,
136132
// Include macro classes, resources, and sources main JAR.
137-
mappings in (Compile, packageBin) <++= mappings in (coreMacros, Compile, packageBin),
138-
mappings in (Compile, packageSrc) <++= mappings in (coreMacros, Compile, packageSrc),
139-
mappings in (Compile, packageBin) <++= mappings in (chiselFrontend, Compile, packageBin),
140-
mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc),
133+
mappings in (Compile, packageBin) ++= (mappings in (coreMacros, Compile, packageBin)).value,
134+
mappings in (Compile, packageSrc) ++= (mappings in (coreMacros, Compile, packageSrc)).value,
135+
mappings in (Compile, packageBin) ++= (mappings in (chiselFrontend, Compile, packageBin)).value,
136+
mappings in (Compile, packageSrc) ++= (mappings in (chiselFrontend, Compile, packageSrc)).value,
141137
// Export the packaged JAR so projects that depend directly on Chisel project (rather than the
142138
// published artifact) also see the stuff in coreMacros and chiselFrontend.
143139
exportJars := true

0 commit comments

Comments
 (0)