Issue monix#58 - fix Build.scala (scaladoc, etc.)

Author: alexandru

README.md

@@ -2,7 +2,7 @@
 
 Idiomatic Reactive Extensions for Scala. Targets both the JVM and [Scala.js](http://www.scala-js.org/).
 
-[![Build Status](https://travis-ci.org/monifu/monifu.png?branch=v1.0-M6)](https://travis-ci.org/monifu/monifu)
+[![Build Status](https://travis-ci.org/monifu/monifu.png?branch=v1.0-M7)](https://travis-ci.org/monifu/monifu)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/monifu/monifu?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Teaser
@@ -60,18 +60,18 @@ Release Notes:
 The packages are published on Maven Central. Compiled for Scala 2.11.5
 and Scala.js 0.6.0. Older versions are no longer supported.
 
-- Current stable release is: `1.0-M6`
+- Current stable release is: `1.0-M7`
 
 ### For the JVM
 
 ```scala
-libraryDependencies += "org.monifu" %% "monifu" % "1.0-M6"
+libraryDependencies += "org.monifu" %% "monifu" % "1.0-M7"
 ```
 
 ### For targeting Javascript runtimes with Scala.js
 
 ```scala
-libraryDependencies += "org.monifu" %%% "monifu" % "1.0-M6"
+libraryDependencies += "org.monifu" %%% "monifu" % "1.0-M7"
 ```
 
 ## License

rootdoc.txt renamed to js/rootdoc.txt

@@ -0,0 +1,34 @@
+<img src="https://raw.githubusercontent.com/wiki/alexandru/monifu/assets/monifu.png" align="right" />
+
+This is the API documentation for the [[https://github.com/alexandru/monifu Monifu]] library.
+
+==Overview==
+
+Monifu is a library for functional reactive programming. Checkout the [[http://www.reactivemanifesto.org/ Reactive Manifesto]] for the need to go reactive.
+
+Monifu brings an implementation of [[https://rx.codeplex.com/ Reactive Extensions]],
+with back-pressure added (also the [[http://www.reactive-streams.org/ Reactive Streams effort]]),
+plus multi-threading primitives for building efficient, concurrent and non-blocking algorithms.
+
+==Rx Sample==
+
+Sample: {{{
+  import monifu.concurrent.Implicits.globalScheduler
+  import play.api.libs.ws._
+  import monifu.reactive._
+
+  // emits an auto-incremented number, every second
+  Observable.interval(1.second)
+    // drops the first 10 emitted events
+    .drop(10) 
+    // takes the first 100 emitted events  
+    .take(100) 
+    // per second, makes requests and concatenates the results
+    .flatMap(x => WS.request(s"http://some.endpoint.com/request?tick=$x").get())
+    // filters only valid responses
+    .filter(response => response.status == 200) 
+    // processes response, selecting the body
+    .map(response => response.body) 
+    // creates subscription, foreach response print it
+    .foreach(x => println(x))
+}}}

jvm/rootdoc.txt

@@ -25,7 +25,6 @@ object Build extends SbtBuild {
   val compilerSettings = Seq(
     scalaVersion := "2.11.7",
 
-    scalacOptions <<= baseDirectory.map { bd => Seq("-sourcepath", bd.getAbsolutePath) },
     scalacOptions ++= Seq(
       "-unchecked", "-deprecation", "-feature", "-Xlint", "-target:jvm-1.6", "-Yinline-warnings",
       "-optimise", "-Ywarn-adapted-args", "-Ywarn-dead-code", "-Ywarn-inaccessible",
@@ -37,16 +36,12 @@ object Build extends SbtBuild {
     scalacOptions in (Compile, doc) ++=
       Opts.doc.sourceUrl(s"https://github.com/monifu/monifu/tree/v${version.value}/monifu€{FILE_PATH}.scala"),
     scalacOptions in (Compile, doc) ++=
-      Opts.doc.title(s"Monifu"),
+      Seq("-doc-root-content", baseDirectory.value + "/rootdoc.txt"),
     scalacOptions in (Compile, doc) ++=
       Opts.doc.version(s"${version.value}"),
-    scalacOptions in (Compile, doc) ++=
-      Seq("-doc-root-content", "rootdoc.txt"),
-    scalacOptions in (Compile, doc) <<= baseDirectory.map(bd =>
-      Seq(
-        "-Ymacro-no-expand",
-        "-sourcepath", bd.getAbsolutePath
-      ))
+    scalacOptions in ThisBuild <++= baseDirectory.map { bd =>
+      Seq("-sourcepath", bd.getAbsolutePath)
+    }
   )
 
   val sharedSettings = compilerSettings ++ Seq(
@@ -107,13 +102,15 @@ object Build extends SbtBuild {
     .settings(sharedSettings: _*)
     .settings(name := "monifu")
     .jvmSettings(
+      scalacOptions in (Compile, doc) ++= Opts.doc.title(s"Monifu"),
       testFrameworks += new TestFramework("minitest.runner.Framework"),
       libraryDependencies ++= Seq(
         "org.reactivestreams" % "reactive-streams" % "1.0.0.final",
         "org.monifu" %% "minitest" % "0.13" % "test"
       ))
     .jsSettings(
-//      scalaJSStage in Test := FastOptStage,
+      scalacOptions in (Compile, doc) ++= Opts.doc.title(s"Monifu (JS)"),
+      scalaJSStage in Test := FastOptStage,
       testFrameworks += new TestFramework("minitest.runner.Framework"),
       libraryDependencies ++= Seq(
         "org.monifu" %%% "minitest" % "0.13" % "test"