Integrates sbt-org-policies and (#63)

* Provides cross versioning with scala 2.12

Author: juanpedromoreno

.scalafmt

@@ -0,0 +1,23 @@
+style = defaultWithAlign
+maxColumn = 100
+
+continuationIndent.callSite = 2
+
+newlines {
+  sometimesBeforeColonInMethodReturnType = false
+}
+
+align {
+  arrowEnumeratorGenerator = false
+  ifWhileOpenParen = false
+  openParenCallSite = false
+  openParenDefnSite = false
+}
+
+docstrings = JavaDoc
+
+rewrite {
+  rules = [SortImports, RedundantBraces]
+  redundantBraces.maxLines = 1
+}
+        

.scalafmt.conf

@@ -2,6 +2,7 @@ language: scala
 scala:
   - 2.10.6
   - 2.11.8
+  - 2.12.1
 jdk:
   - oraclejdk8
 before_install:

.travis.yml

@@ -1,6 +1,25 @@
 Changelog
 =============
 
+## 2017/03/22 - Version 0.12.0
+
+This release:
+
+* Makes the library compatible with Scala 2.12.
+* It also integrates `sbt-org-policies` plugin to make easier its maintainability.
+* Upgrades the dependencies (through sbt-org-policies plugin).
+
+## 2017/03/22 - Version 0.11.1
+
+Adds these new fields to the User model:
+
+* `company`: Option[String]
+* `blog`: Option[String]
+* `location`: Option[String]
+* `bio`: Option[String]
+
+Thanks @fedefernandez for your time!
+
 ## 2017/03/16 - Version 0.11.0
 
 This release brings:

CHANGELOG.md

@@ -6,6 +6,13 @@ Github4s
 
 **Github4s** is a GitHub API wrapper written in Scala.
 
+## Installation
+
+To get started with SBT, simply add the following to your build.sbt file:
+
+```
+libraryDependencies += "com.47deg" %% "github4s" % "0.12.0"
+```
 
 # License
 

README.md

@@ -1,100 +1,23 @@
-import de.heikoseeberger.sbtheader.license.MIT
-import PgpKeys.gpgCommand
-
-pgpPassphrase := Some(sys.env.getOrElse("PGP_PASSPHRASE", "").toCharArray)
-pgpPublicRing := file(s"${sys.env.getOrElse("PGP_FOLDER", ".")}/pubring.gpg")
-pgpSecretRing := file(s"${sys.env.getOrElse("PGP_FOLDER", ".")}/secring.gpg")
-
-val dev = Seq(Dev("47 Degrees (twitter: @47deg)", "47 Degrees"))
-val gh  = GitHubSettings("com.47deg", "github4s", "47 Degrees", mit)
-
-lazy val buildSettings = Seq(
-    name := gh.proj,
-    organization := gh.org,
-    organizationName := gh.publishOrg,
-    description := "Github API wrapper written in Scala",
-    startYear := Option(2016),
-    homepage := Option(url("http://47deg.github.io/github4s/")),
-    organizationHomepage := Option(new URL("http://47deg.com")),
-    scalaVersion := "2.11.8",
-    crossScalaVersions := Seq("2.10.6", scalaVersion.value),
-    scalacOptions ++= (scalaBinaryVersion.value match {
-    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>")
-    )
-  ) ++ reformatOnCompileSettings ++
-    sharedCommonSettings ++
-    miscSettings ++
-    sharedReleaseProcess ++
-    credentialSettings ++
-    sharedPublishSettings(gh, dev)
-
-lazy val micrositeSettings = Seq(
-  micrositeName := "github4s",
-  micrositeDescription := "Github API wrapper written in Scala",
-  micrositeBaseUrl := "github4s",
-  micrositeDocumentationUrl := "/github4s/docs.html",
-  micrositeGithubOwner := "47deg",
-  micrositeGithubRepo := "github4s",
-  includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.swf" | "*.md"
-)
-
-lazy val commonDeps =
-  Seq(
-    libraryDependencies ++= Seq(
-      "org.typelevel" %%% "cats"          % "0.9.0",
-      "io.circe"      %%% "circe-core"    % "0.7.0",
-      "io.circe"      %%% "circe-generic" % "0.7.0",
-      "io.circe"      %%% "circe-parser"  % "0.7.0",
-      "org.scalatest" %%% "scalatest" % "3.0.0" % "test",
-      "com.github.marklister" %%% "base64" % "0.2.3",
-      compilerPlugin(
-        "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full
-      )
-    ))
-
-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"
-  )
-)
-
-lazy val docsDependencies = libraryDependencies ++= Seq(
-    "com.ironcorelabs" %% "cats-scalatest"  % "1.1.2"  % "test",
-    "org.mock-server"  % "mockserver-netty" % "3.10.4" % "test"
-  )
-
-lazy val scalazDependencies = Seq(
-  libraryDependencies +=
-    "org.scalaz" %% "scalaz-concurrent" % "7.2.9"
-)
+pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray)
+pgpPublicRing := file(s"$gpgFolder/pubring.gpg")
+pgpSecretRing := file(s"$gpgFolder/secring.gpg")
 
 lazy val root = (project in file("."))
-  .settings(buildSettings: _*)
+  .dependsOn(github4sJVM, github4sJS, scalaz, docs)
   .aggregate(github4sJVM, github4sJS, scalaz, docs)
+  .settings(noPublishSettings: _*)
 
-/** 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" -> sys.env.getOrElse("GITHUB4S_ACCESS_TOKEN", "")),
+    buildInfoKeys := Seq[BuildInfoKey](
+      name,
+      version,
+      "token" -> sys.env.getOrElse("GITHUB4S_ACCESS_TOKEN", "")),
     buildInfoPackage := "github4s"
   )
-  .settings(buildSettings: _*)
   .settings(commonDeps: _*)
   .jvmSettings(jvmDeps: _*)
   .jsSettings(sharedJsSettings: _*)
@@ -107,19 +30,13 @@ lazy val github4sJS  = github4s.js
 lazy val docs = (project in file("docs"))
   .dependsOn(scalaz)
   .settings(moduleName := "github4s-docs")
-  .settings(buildSettings: _*)
   .settings(micrositeSettings: _*)
   .settings(docsDependencies: _*)
   .settings(noPublishSettings: _*)
   .enablePlugins(MicrositesPlugin)
 
 lazy val scalaz = (project in file("scalaz"))
   .settings(moduleName := "github4s-scalaz")
-  .settings(buildSettings: _*)
   .settings(scalazDependencies: _*)
   .dependsOn(github4sJVM)
   .enablePlugins(AutomateHeaderPlugin)
-
-lazy val testSettings = Seq(
-  fork in Test := false
-)

build.sbt

@@ -15,7 +15,7 @@ Github4s is a GitHub API wrapper written in Scala.
 To get started with SBT, simply add the following to your build.sbt file:
 
 ```
-libraryDependencies += "com.47deg" %% "github4s" % "0.11.0"
+libraryDependencies += "com.47deg" %% "github4s" % "0.12.0"
 ```
 
 ## License

docs/src/main/tut/index.md

@@ -44,8 +44,9 @@ import monix.reactive.Observable
 import scala.util.{Failure, Success}
 
 case class CirceJSONBody(value: String) extends BulkBodyPart {
-  override def contentType: String     = s"application/json; charset=utf-8"
-  override def contentData: ByteBuffer = ByteBuffer.wrap(value.getBytes("utf-8"))
+  override def contentType: String = s"application/json; charset=utf-8"
+  override def contentData: ByteBuffer =
+    ByteBuffer.wrap(value.getBytes("utf-8"))
 }
 
 trait HttpRequestBuilderExtensionJS {
@@ -79,7 +80,8 @@ trait HttpRequestBuilderExtensionJS {
           .getOrElse(request.send())
           .map(toEntity[A])
           .recoverWith {
-            case e => Future.successful(Either.left(UnexpectedException(e.getMessage)))
+            case e =>
+              Future.successful(Either.left(UnexpectedException(e.getMessage)))
           }
       }
     }

github4s/js/src/main/scala/github4s/HttpRequestBuilderExtensionJS.scala

@@ -31,6 +31,7 @@ import scala.concurrent.Future
 
 trait ImplicitsJS extends FutureInstances with HttpRequestBuilderExtensionJS {
 
-  implicit val intInstanceFutureRosHttp = new Interpreters[Future, SimpleHttpResponse]
+  implicit val intInstanceFutureRosHttp =
+    new Interpreters[Future, SimpleHttpResponse]
 
 }

github4s/js/src/main/scala/github4s/js/ImplicitsJS.scala

@@ -23,6 +23,7 @@ package github4s.util
 
 object URLEncoder {
 
-  def encode(string: String): String = fr.hmil.roshttp.util.Utils.encodeQueryString(string)
+  def encode(string: String): String =
+    fr.hmil.roshttp.util.Utils.encodeQueryString(string)
 
 }