Merge branch 'master' into tobits-deprecation

1 files changed, 15 insertions, 9 deletions

diff --git a/build.sbt b/build.sbt
index f2074fca..1dbd0abf 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,10 +6,18 @@ site.includeScaladoc()
 
 ghpages.settings
 
+import UnidocKeys._
+
+lazy val customUnidocSettings = unidocSettings ++ Seq (
+  doc in Compile := (doc in ScalaUnidoc).value,
+  target in unidoc in ScalaUnidoc := crossTarget.value / "api"
+)
+
 lazy val commonSettings = Seq (
   organization := "edu.berkeley.cs",
-  version := "3.0",
+  version := "3.1-SNAPSHOT",
   git.remoteRepo := "git@github.com:ucb-bar/chisel3.git",
+  autoAPIMappings := true,
   scalaVersion := "2.11.7"
 )
 
@@ -50,8 +58,8 @@ lazy val chiselSettings = Seq (
   },
 
   resolvers ++= Seq(
-    "Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots",
-    "Sonatype Releases" at "http://oss.sonatype.org/content/repositories/releases"
+    Resolver.sonatypeRepo("snapshots"),
+    Resolver.sonatypeRepo("releases")
   ),
 
   /* Bumping "com.novocode" % "junit-interface" % "0.11", causes DelayTest testSeqReadBundle to fail
@@ -94,18 +102,16 @@ lazy val chiselFrontend = (project in file("chiselFrontend")).
 
 lazy val chisel = (project in file(".")).
   settings(commonSettings: _*).
+  settings(customUnidocSettings: _*).
   settings(chiselSettings: _*).
   dependsOn(coreMacros).
   dependsOn(chiselFrontend).
   settings(
+    aggregate in doc := false,
     // Include macro classes, resources, and sources main jar.
     mappings in (Compile, packageBin) <++= mappings in (coreMacros, Compile, packageBin),
     mappings in (Compile, packageSrc) <++= mappings in (coreMacros, Compile, packageSrc),
     mappings in (Compile, packageBin) <++= mappings in (chiselFrontend, Compile, packageBin),
     mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc)
-  )
-
-// This is ugly. There must be a better way.
-publish <<= (publish) dependsOn (publish in coreMacros, publish in chiselFrontend)
-
-publishLocal <<= (publishLocal) dependsOn (publishLocal in coreMacros, publishLocal in chiselFrontend)
+  ).
+  aggregate(coreMacros, chiselFrontend)