Source formatting

1 files changed, 16 insertions, 16 deletions

diff --git a/build.sbt b/build.sbt
index 09f50d0..3aea1fe 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,26 +1,26 @@
 import scalariform.formatter.preferences._
 
-lazy val commonSettings = scalariformSettings ++ Seq(
+lazy val commonSettings = Seq(
   organization := "com.softwaremill.sttp",
   version := "0.1",
   scalaVersion := "2.12.2",
   crossScalaVersions := Seq(scalaVersion.value, "2.11.8"),
   scalacOptions ++= Seq("-unchecked", "-deprecation"),
-  ScalariformKeys.preferences := ScalariformKeys.preferences.value
-    .setPreference(DoubleIndentClassDeclaration, true)
-    .setPreference(PreserveSpaceBeforeArguments, true)
-    .setPreference(CompactControlReadability, true)
-    .setPreference(SpacesAroundMultiImports, false),
+  scalafmtOnCompile := true,
   // Sonatype OSS deployment
   publishTo := {
     val nexus = "https://oss.sonatype.org/"
-    val (name, url) = if (isSnapshot.value) ("snapshots", nexus + "content/repositories/snapshots")
-                      else ("releases", nexus + "service/local/staging/deploy/maven2")
+    val (name, url) =
+      if (isSnapshot.value)
+        ("snapshots", nexus + "content/repositories/snapshots")
+      else ("releases", nexus + "service/local/staging/deploy/maven2")
     Some(name at url)
   },
   credentials += Credentials(Path.userHome / ".ivy2" / ".credentials"),
   publishMavenStyle := true,
-  pomIncludeRepository := { _ => false },
+  pomIncludeRepository := { _ =>
+    false
+  },
   pomExtra := (
     <scm>
       <url>git@github.com/softwaremill/sttp.git</url>
@@ -33,8 +33,10 @@ lazy val commonSettings = scalariformSettings ++ Seq(
           <url>http://www.warski.org</url>
         </developer>
       </developers>
-    ),
-  licenses := ("Apache2", new java.net.URL("http://www.apache.org/licenses/LICENSE-2.0.txt")) :: Nil,
+  ),
+  licenses := ("Apache2",
+               new java.net.URL(
+                 "http://www.apache.org/licenses/LICENSE-2.0.txt")) :: Nil,
   homepage := Some(new java.net.URL("http://softwaremill.com/open-source"))
 )
 
@@ -45,9 +47,7 @@ val scalaTest = "org.scalatest" %% "scalatest" % "3.0.3" % "test"
 
 lazy val rootProject = (project in file("."))
   .settings(commonSettings: _*)
-  .settings(
-    publishArtifact := false,
-    name := "sttp")
+  .settings(publishArtifact := false, name := "sttp")
   .aggregate(core, akkaHttpHandler, tests)
 
 lazy val core: Project = (project in file("core"))
@@ -67,7 +67,7 @@ lazy val akkaHttpHandler: Project = (project in file("akka-http-handler"))
     libraryDependencies ++= Seq(
       akkaHttp
     )
-  ) dependsOn(core)
+  ) dependsOn (core)
 
 lazy val tests: Project = (project in file("tests"))
   .settings(commonSettings: _*)
@@ -79,4 +79,4 @@ lazy val tests: Project = (project in file("tests"))
       "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0" % "test",
       "com.github.pathikrit" %% "better-files" % "3.0.0"
     )
-  ) dependsOn(core, akkaHttpHandler)
\ No newline at end of file
+  ) dependsOn (core, akkaHttpHandler)