Skip to content

Commit 9bf80d0

Browse files
committed
bump release SNAPSHOT
2 parents da5d4b7 + 48c0322 commit 9bf80d0

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

build.sbt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ lazy val customUnidocSettings = unidocSettings ++ Seq (
1515

1616
lazy val commonSettings = Seq (
1717
organization := "edu.berkeley.cs",
18-
version := "3.0-SNAPSHOT_2017-07-17",
18+
version := "3.0-SNAPSHOT_2017-07-19",
1919
git.remoteRepo := "git@github.com:ucb-bar/chisel3.git",
2020
autoAPIMappings := true,
2121
scalaVersion := "2.11.11",
@@ -65,7 +65,8 @@ lazy val publishSettings = 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")
@@ -76,7 +77,7 @@ lazy val publishSettings = Seq (
7677
}
7778
)
7879

79-
val defaultVersions = Map("firrtl" -> "1.0-SNAPSHOT_2017-07-17")
80+
val defaultVersions = Map("firrtl" -> "1.0-SNAPSHOT_2017-07-19")
8081

8182
lazy val chiselSettings = Seq (
8283
name := "chisel3",
@@ -95,11 +96,6 @@ lazy val chiselSettings = Seq (
9596
parallelExecution in Test := true,
9697

9798
javacOptions ++= Seq("-target", "1.7")
98-
// Hopefully we get these options back in Chisel3
99-
// scalacOptions in (Compile, doc) <++= (baseDirectory in LocalProject("chisel"), version) map { (bd, v) =>
100-
// Seq("-diagrams", "-diagrams-max-classes", "25", "-sourcepath", bd.getAbsolutePath, "-doc-source-url",
101-
// "https://github.com/ucb-bar/chisel/tree/master/€{FILE_PATH}.scala")
102-
// }
10399
)
104100

105101
lazy val coreMacros = (project in file("coreMacros")).
@@ -140,10 +136,10 @@ lazy val chisel = (project in file(".")).
140136
),
141137
aggregate in doc := false,
142138
// Include macro classes, resources, and sources main JAR.
143-
mappings in (Compile, packageBin) <++= mappings in (coreMacros, Compile, packageBin),
144-
mappings in (Compile, packageSrc) <++= mappings in (coreMacros, Compile, packageSrc),
145-
mappings in (Compile, packageBin) <++= mappings in (chiselFrontend, Compile, packageBin),
146-
mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc),
139+
mappings in (Compile, packageBin) ++= (mappings in (coreMacros, Compile, packageBin)).value,
140+
mappings in (Compile, packageSrc) ++= (mappings in (coreMacros, Compile, packageSrc)).value,
141+
mappings in (Compile, packageBin) ++= (mappings in (chiselFrontend, Compile, packageBin)).value,
142+
mappings in (Compile, packageSrc) ++= (mappings in (chiselFrontend, Compile, packageSrc)).value,
147143
// Export the packaged JAR so projects that depend directly on Chisel project (rather than the
148144
// published artifact) also see the stuff in coreMacros and chiselFrontend.
149145
exportJars := true

0 commit comments

Comments
 (0)