Merge pull request #50 from 47deg/adds-root-package

Adds a new root project to set Scala version
47degrees · Jan 5, 2017 · 045ffd7 · 045ffd7
2 parents 55f171d + d36e566
commit 045ffd7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 23 deletions.
diff --git a/build.sbt b/build.sbt
@@ -21,9 +21,9 @@ lazy val buildSettings = Seq(
     scalaVersion := "2.11.8",
     crossScalaVersions := Seq("2.10.6", scalaVersion.value),
     scalacOptions ++= (scalaBinaryVersion.value match {
-      case "2.10" => Seq("-Xdivergence211")
-      case _      => Nil
-    }),
+    case "2.10" => Seq("-Xdivergence211")
+    case _      => Nil
+  }),
     scalafmtConfig in ThisBuild := Some(file(".scalafmt")),
     headers := Map(
       "scala" -> MIT("2016", "47 Degrees, LLC. <http://www.47deg.com>")
@@ -46,23 +46,24 @@ lazy val micrositeSettings = Seq(
 )
 
 lazy val commonDeps = addLibs(vAll,
-                                "cats-free",
-                                "circe-core",
-                                "circe-generic",
-                                "circe-parser",
-                                "simulacrum") ++
+                              "cats-free",
+                              "circe-core",
+                              "circe-generic",
+                              "circe-parser",
+                              "simulacrum") ++
     addCompilerPlugins(vAll, "paradise") ++
-Seq(libraryDependencies ++= Seq(
-  "org.scalatest" %%% "scalatest" % "3.0.0" % "test",
-  "com.github.marklister" %%% "base64" % "0.2.3"
-))
-
-lazy val jvmDeps = Seq(
+    Seq(
       libraryDependencies ++= Seq(
-        "org.scalaj" %% "scalaj-http" % "2.3.0",
-        "org.mock-server" % "mockserver-netty" % "3.10.4" % "test"
+        "org.scalatest" %%% "scalatest" % "3.0.0" % "test",
+        "com.github.marklister" %%% "base64" % "0.2.3"
       ))
 
+lazy val jvmDeps = Seq(
+  libraryDependencies ++= Seq(
+    "org.scalaj" %% "scalaj-http" % "2.3.0",
+    "org.mock-server" % "mockserver-netty" % "3.10.4" % "test"
+  ))
+
 lazy val jsDeps = Seq(
   libraryDependencies ++= Seq(
     "fr.hmil" %%% "roshttp" % "2.0.0-RC1"
@@ -76,15 +77,21 @@ lazy val docsDependencies = libraryDependencies ++= Seq(
 
 lazy val scalazDependencies = addLibs(vAll, "scalaz-concurrent")
 
+lazy val root = (project in file("."))
+  .settings(buildSettings: _*)
+  .aggregate(github4sJVM, github4sJS, scalaz, docs)
+
 /** github4s - cross project that provides cross platform support.*/
 lazy val github4s = (crossProject in file("github4s"))
   .settings(moduleName := "github4s")
   .enablePlugins(AutomateHeaderPlugin)
-    .enablePlugins(BuildInfoPlugin).
-    settings(
-      buildInfoKeys := Seq[BuildInfoKey](name, version, "token" -> Option(sys.props("token")).getOrElse("")),
-      buildInfoPackage := "github4s"
-    )
+  .enablePlugins(BuildInfoPlugin)
+  .settings(
+    buildInfoKeys := Seq[BuildInfoKey](name,
+                                       version,
+                                       "token" -> Option(sys.props("token")).getOrElse("")),
+    buildInfoPackage := "github4s"
+  )
   .settings(buildSettings: _*)
   .settings(commonDeps: _*)
   .jvmSettings(jvmDeps: _*)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
 addSbtPlugin("com.fortysevendeg" % "sbt-catalysts-extras" % "0.1.2")
 addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.4.7")
 addSbtPlugin("com.fortysevendeg" % "sbt-microsites" % "0.2.6")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.4.0")
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.9.1-SNAPSHOT"
+version in ThisBuild := "0.9.1-SNAPSHOT"