Merge 014ebd2 into 8485b1f

.scalafmt.conf

@@ -0,0 +1,10 @@
+style = default
+maxColumn = 120
+continuationIndent.defnSite = 2
+continuationIndent.callSite = 2
+align=none
+danglingParentheses = true
+optIn.configStyleArguments = false
+docstrings = ScalaDoc
+spaces.beforeContextBoundColon = true
+rewrite.rules = [SortImports]

build.sbt

@@ -9,10 +9,7 @@ licenses := Seq("Apache License, ASL Version 2.0" → url("http://www.apache.org
 scalaVersion := "2.12.6"
 crossScalaVersions := Seq("2.11.11", "2.12.6")
 
-scalacOptions ++= Seq(
-  "-deprecation",
-  "-feature",
-  "-Xlint:-missing-interpolator,-unused,_")
+scalacOptions ++= Seq("-deprecation", "-feature", "-Xlint:-missing-interpolator,-unused,_")
 
 scalacOptions ++= {
   if (scalaVersion.value startsWith "2.12")
@@ -26,19 +23,14 @@ testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oF")
 libraryDependencies ++= Seq(
   // AST Parser
   "org.parboiled" %% "parboiled" % "2.1.4",
-
   // AST Visitor
   "org.sangria-graphql" %% "macro-visit" % "0.1.1",
-
   // Marshalling
   "org.sangria-graphql" %% "sangria-marshalling-api" % "1.0.3",
-
   // Streaming
   "org.sangria-graphql" %% "sangria-streaming-api" % "1.0.0",
-
   // Macros
   "org.scala-lang" % "scala-reflect" % scalaVersion.value,
-
   // Testing
   "org.scalatest" %% "scalatest" % "3.0.5" % "test",
   "org.sangria-graphql" %% "sangria-marshalling-testkit" % "1.0.1" % Test,
@@ -48,7 +40,6 @@ libraryDependencies ++= Seq(
   "org.sangria-graphql" %% "sangria-monix" % "1.0.0" % Test,
   "org.sangria-graphql" %% "sangria-rxscala" % "1.0.0" % Test,
   "eu.timepit" %% "refined" % "0.9.2" % Test,
-
   // CATs
   "net.jcazevedo" %% "moultingyaml" % "0.4.0" % Test,
   "io.github.classgraph" % "classgraph" % "4.0.6" % Test
@@ -63,15 +54,18 @@ publishTo := Some(
   if (isSnapshot.value)
     "snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
   else
-    "releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
+    "releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+)
 
 startYear := Some(2015)
 organizationHomepage := Some(url("https://github.com/sangria-graphql"))
 developers := Developer("OlegIlyenko", "Oleg Ilyenko", "", url("https://github.com/OlegIlyenko")) :: Nil
-scmInfo := Some(ScmInfo(
-  browseUrl = url("https://github.com/sangria-graphql/sangria.git"),
-  connection = "scm:git:git@github.com:sangria-graphql/sangria.git"
-))
+scmInfo := Some(
+  ScmInfo(
+    browseUrl = url("https://github.com/sangria-graphql/sangria.git"),
+    connection = "scm:git:git@github.com:sangria-graphql/sangria.git"
+  )
+)
 
 // nice *magenta* prompt!
 

project/scalafmt.sbt

@@ -0,0 +1 @@
+addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1")