v2.0.0-M0 for scalac and compiler plugins

build.sbt

@@ -2,103 +2,76 @@ import sbt._
 import sbt.Keys._
 import sbtrelease.ReleasePlugin.autoImport._
 import com.typesafe.sbt.pgp.PgpKeys
-import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
-import org.scalajs.sbtplugin.cross.CrossProject
-import org.scalajs.sbtplugin.cross.CrossType
+
 
 val Org = "org.scoverage"
-val MockitoVersion = "1.10.19"
 val ScalatestVersion = "3.0.0"
 
 val appSettings = Seq(
-    organization := Org,
-    scalaVersion := "2.11.8",
-    crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-RC1"),
-    fork in Test := false,
-    publishMavenStyle := true,
-    publishArtifact in Test := false,
-    parallelExecution in Test := false,
-    scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8"),
-    concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
-    publishTo <<= version {
-      (v: String) =>
-        val nexus = "https://oss.sonatype.org/"
-        if (v.trim.endsWith("-SNAPSHOT"))
-          Some(Resolver.sonatypeRepo("snapshots"))
-        else
-          Some("releases" at nexus + "service/local/staging/deploy/maven2")
-    },
-    pomExtra := {
-      <url>https://github.com/scoverage/scalac-scoverage-plugin</url>
-        <licenses>
-          <license>
-            <name>Apache 2</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-            <distribution>repo</distribution>
-          </license>
-        </licenses>
-        <scm>
-          <url>[email protected]:scoverage/scalac-scoverage-plugin.git</url>
-          <connection>scm:[email protected]:scoverage/scalac-scoverage-plugin.git</connection>
-        </scm>
-        <developers>
-          <developer>
-            <id>sksamuel</id>
-            <name>Stephen Samuel</name>
-            <url>http://github.com/sksamuel</url>
-          </developer>
-        </developers>
-    },
-    pomIncludeRepository := {
-      _ => false
-    }
-  ) ++ Seq(
-    releaseCrossBuild := true,
-    releasePublishArtifactsAction := PgpKeys.publishSigned.value
-  )
+  organization := Org,
+  scalaVersion := "2.11.8",
+  crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0-RC1"),
+  fork in Test := false,
+  publishMavenStyle := true,
+  publishArtifact in Test := false,
+  parallelExecution in Test := false,
+  scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8"),
+  concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
+  publishTo := {
+    val nexus = "https://oss.sonatype.org/"
 
-lazy val root = Project("scalac-scoverage", file("."))
-    .settings(name := "scalac-scoverage")
-    .settings(appSettings: _*)
-    .settings(publishArtifact := false)
-    .aggregate(plugin, runtime.jvm, runtime.js)
+    if (isSnapshot.value)
+      Some("snapshots" at nexus + "content/repositories/snapshots")
+    else
+      Some("releases" at nexus + "service/local/staging/deploy/maven2")
+  },
+  pomExtra := {
+    <url>https://github.com/scoverage/scalac-scoverage-plugin</url>
+      <licenses>
+        <license>
+          <name>Apache 2</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+      <scm>
+        <url>[email protected]:scoverage/scalac-scoverage-plugin.git</url>
+        <connection>scm:[email protected]:scoverage/scalac-scoverage-plugin.git</connection>
+      </scm>
+      <developers>
+        <developer>
+          <id>sksamuel</id>
+          <name>Stephen Samuel</name>
+          <url>http://github.com/sksamuel</url>
+        </developer>
+      </developers>
+  },
+  pomIncludeRepository := {
+    _ => false
+  }
+) ++ Seq(
+  releaseCrossBuild := true,
+  releasePublishArtifactsAction := PgpKeys.publishSigned.value
+)
 
-lazy val runtime = CrossProject("scalac-scoverage-runtime", file("scalac-scoverage-runtime"), CrossType.Full)
-    .settings(name := "scalac-scoverage-runtime")
-    .settings(appSettings: _*)
-    .jvmSettings(
-      libraryDependencies ++= Seq(
-      "org.mockito" % "mockito-all" % MockitoVersion % "test",
-      "org.scalatest" %% "scalatest" % ScalatestVersion % "test"
-      )
-    )
-    .jsSettings(
-      libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion % "test",
-      scalaJSStage := FastOptStage
-    )
+lazy val root = Project("scalac-scoverage", file("."))
+  .settings(name := "scalac-scoverage")
+  .settings(appSettings: _*)
+  .settings(noPublishSettings)
+  .aggregate(reporting)
 
-lazy val `scalac-scoverage-runtimeJVM` = runtime.jvm
-lazy val `scalac-scoverage-runtimeJS` = runtime.js
+lazy val noPublishSettings = Seq(
+  publishArtifact := false,
+  // The above is enough for Maven repos but it doesn't prevent publishing of ivy.xml files
+  publish := {},
+  publishLocal := {}
+)
 
-lazy val plugin = Project("scalac-scoverage-plugin", file("scalac-scoverage-plugin"))
-    .dependsOn(`scalac-scoverage-runtimeJVM` % "test")
-    .settings(name := "scalac-scoverage-plugin")
-    .settings(appSettings: _*)
-    .settings(libraryDependencies ++= Seq(
-    "org.mockito" % "mockito-all" % MockitoVersion % "test",
+lazy val reporting = Project("scalac-scoverage-reporting", file("scalac-scoverage-reporting"))
+  .settings(name := "scalac-scoverage-reporting")
+  .settings(appSettings: _*)
+  .settings(libraryDependencies ++= Seq(
+    Org %% "scalac-scoverage-plugin" % "2.0.0-M0" cross CrossVersion.full,
     "org.scalatest" %% "scalatest" % ScalatestVersion % "test",
-    "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",
-    "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided",
-    "org.joda" % "joda-convert" % "1.6" % "test",
-    "joda-time" % "joda-time" % "2.3" % "test"
-  )).settings(libraryDependencies ++= {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, scalaMajor)) if scalaMajor > 10 => Seq(
-        "org.scala-lang.modules" %% "scala-xml" % "1.0.5",
-        "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0" % "test"
-      )
-      case _ => Seq(
-        "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2" % "test"
-      )
-    }
-  })
+    "org.scala-lang" % "scala-compiler" % scalaVersion.value % "provided"
+  ))

project/plugins.sbt

@@ -4,4 +4,5 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
 
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
+// For now...
+//addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")