@@ -15,7 +15,7 @@ lazy val customUnidocSettings = unidocSettings ++ Seq (
15
15
16
16
lazy val commonSettings = Seq (
17
17
organization := " edu.berkeley.cs" ,
18
- version := " 3.0-SNAPSHOT_2017-07-17 " ,
18
+ version := " 3.0-SNAPSHOT_2017-07-19 " ,
19
19
git.remoteRepo := " git@github.com:ucb-bar/chisel3.git" ,
20
20
autoAPIMappings := true ,
21
21
scalaVersion := " 2.11.11" ,
@@ -65,7 +65,8 @@ lazy val publishSettings = Seq (
65
65
</developer >
66
66
</developers >,
67
67
68
- publishTo <<= version { v : String =>
68
+ publishTo := {
69
+ val v = version.value
69
70
val nexus = " https://oss.sonatype.org/"
70
71
if (v.trim.endsWith(" SNAPSHOT" )) {
71
72
Some (" snapshots" at nexus + " content/repositories/snapshots" )
@@ -76,7 +77,7 @@ lazy val publishSettings = Seq (
76
77
}
77
78
)
78
79
79
- val defaultVersions = Map (" firrtl" -> " 1.0-SNAPSHOT_2017-07-17 " )
80
+ val defaultVersions = Map (" firrtl" -> " 1.0-SNAPSHOT_2017-07-19 " )
80
81
81
82
lazy val chiselSettings = Seq (
82
83
name := " chisel3" ,
@@ -95,11 +96,6 @@ lazy val chiselSettings = Seq (
95
96
parallelExecution in Test := true ,
96
97
97
98
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
- // }
103
99
)
104
100
105
101
lazy val coreMacros = (project in file(" coreMacros" )).
@@ -140,10 +136,10 @@ lazy val chisel = (project in file(".")).
140
136
),
141
137
aggregate in doc := false ,
142
138
// 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 ,
147
143
// Export the packaged JAR so projects that depend directly on Chisel project (rather than the
148
144
// published artifact) also see the stuff in coreMacros and chiselFrontend.
149
145
exportJars := true
0 commit comments