Upgrade SBT to 1.1.0

build.sbt

@@ -1,15 +1,17 @@
-import com.typesafe.sbt.SbtGhPages.GhPagesKeys._
 import microsites.ExtraMdFileConfig
 
 lazy val root = Project("elastic4s", file("."))
-  .settings(publish := {})
-  .settings(publishArtifact := false)
-  .settings(name := "elastic4s")
-  .settings(mappings in(Compile, packageSrc) ++= {
-    val base = (sourceManaged in Compile).value
-    val files = (managedSources in Compile).value
-    files.map { f => (f, f.relativeTo(base).get.getPath) }
-  })
+  .settings(
+    publish := {},
+    publishArtifact := false,
+    name := "elastic4s",
+    mappings in(Compile, packageSrc) ++= {
+      val base = (Compile / sourceManaged).value
+      val files = (Compile / managedSources).value
+      files.map { f => (f, f.relativeTo(base).get.getPath) }
+    },
+    ThisBuild / scalariformAutoformat := false
+  )
   .aggregate(
     core,
     tcp,
@@ -29,17 +31,20 @@ lazy val root = Project("elastic4s", file("."))
   )
 
 lazy val core = Project("elastic4s-core", file("elastic4s-core"))
-  .settings(name := "elastic4s-core")
-  .settings(libraryDependencies ++= Seq(
-    "joda-time"                     % "joda-time"               % "2.9.9",
-    "com.fasterxml.jackson.core"    % "jackson-core"            % JacksonVersion,
-    "com.fasterxml.jackson.core"    % "jackson-databind"        % JacksonVersion,
-    "com.fasterxml.jackson.module"  %% "jackson-module-scala"   % JacksonVersion
-  ))
+  .settings(
+    name := "elastic4s-core",
+    libraryDependencies ++= Seq(
+      "joda-time"                     % "joda-time"               % "2.9.9",
+      "com.fasterxml.jackson.core"    % "jackson-core"            % JacksonVersion,
+      "com.fasterxml.jackson.core"    % "jackson-databind"        % JacksonVersion,
+      "com.fasterxml.jackson.module"  %% "jackson-module-scala"   % JacksonVersion
+    )
+  )
 
 lazy val tcp = Project("elastic4s-tcp", file("elastic4s-tcp"))
-  .settings(name := "elastic4s-tcp")
-    .settings(libraryDependencies ++= Seq(
+  .settings(
+    name := "elastic4s-tcp",
+    libraryDependencies ++= Seq(
       "org.elasticsearch"                     % "elasticsearch"             % ElasticsearchVersion,
       "org.locationtech.spatial4j"            % "spatial4j"                 % "0.6",
       "com.vividsolutions"                    % "jts"                       % "1.13",
@@ -69,7 +74,8 @@ lazy val tcp = Project("elastic4s-tcp", file("elastic4s-tcp"))
       "joda-time"                             % "joda-time"                 % "2.9.9",
       "com.fasterxml.jackson.core"            % "jackson-core"              % JacksonVersion,
       "com.tdunning"                          % "t-digest"                  % "3.1"
-    ))
+    )
+  )
   .dependsOn(core)
 
 lazy val http = Project("elastic4s-http", file("elastic4s-http"))
@@ -183,9 +189,9 @@ lazy val tests = Project("elastic4s-tests", file("elastic4s-tests"))
       "org.apache.logging.log4j" % "log4j-core" % "2.8.2" % "test"
 
     ),
-    fork in Test := true,
-    parallelExecution in Test := false,
-    testForkedParallel in Test := false
+    Test / fork := true,
+    Test / parallelExecution := false,
+    Test / testForkedParallel := false
   )
   .dependsOn(tcp, http, jackson, circe, aws, testkit % "test")
 
@@ -194,7 +200,6 @@ lazy val docsMappingsAPIDir = settingKey[String]("Name of subdirectory in site t
 lazy val docs = project
   .in(file("docs"))
   .enablePlugins(MicrositesPlugin, ScalaUnidocPlugin)
-  .settings(ghpages.settings)
   .settings(noPublishSettings)
   .settings(
     micrositeName := "Elastic4s",
@@ -221,17 +226,17 @@ lazy val docs = project
     git.remoteRepo := "git@github.com:sksamuel/elastic4s.git",
     autoAPIMappings := true,
     docsMappingsAPIDir := "api",
-    addMappingsToSiteDir(mappings in (ScalaUnidoc, packageDoc), docsMappingsAPIDir),
+    addMappingsToSiteDir(ScalaUnidoc / packageDoc / mappings, docsMappingsAPIDir),
     ghpagesNoJekyll := false,
-    fork in tut := false,
-    fork in (ScalaUnidoc, unidoc) := false,
-    includeFilter in makeSite := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.swf" | "*.yml" | "*.md",
+    tut / fork := false,
+    ScalaUnidoc / unidoc / fork := false,
+    makeSite / includeFilter := "*.html" | "*.css" | "*.png" | "*.jpg" | "*.gif" | "*.js" | "*.swf" | "*.yml" | "*.md",
     // push microsite on release
     releaseProcess += releaseStepTask(publishMicrosite)
   ).dependsOn(core, embedded, http, circe, aws)
 
 lazy val noPublishSettings = Seq(
-  publish := (),
-  publishLocal := (),
+  publish := {},
+  publishLocal := {},
   publishArtifact := false
 )

project/Build.scala

@@ -34,23 +34,18 @@ object Build extends AutoPlugin {
 
   override def projectSettings = Seq(
     organization := org,
-    // a 'compileonly' configuation
-    ivyConfigurations += config("compileonly").hide,
-    // appending everything from 'compileonly' to unmanagedClasspath
-    unmanagedClasspath in Compile ++= update.value.select(configurationFilter("compileonly")),
     scalaVersion := "2.11.12",
     crossScalaVersions := Seq("2.11.12", "2.12.4"),
     publishMavenStyle := true,
     resolvers += Resolver.mavenLocal,
     resolvers += Resolver.url("https://artifacts.elastic.co/maven"),
     javaOptions ++= Seq("-Xms512M", "-Xmx2048M", "-XX:MaxPermSize=2048M", "-XX:+CMSClassUnloadingEnabled"),
-    publishArtifact in Test := false,
+    Test / publishArtifact := false,
     fork := false,
-    parallelExecution := false,
-    parallelExecution in ThisBuild := false,
+    ThisBuild /parallelExecution in ThisBuild := false,
     SbtPgp.autoImport.useGpg := true,
     SbtPgp.autoImport.useGpgAgent := true,
-    concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
+    Global / concurrentRestrictions += Tags.limit(Tags.Test, 1),
     sbtrelease.ReleasePlugin.autoImport.releasePublishArtifactsAction := PgpKeys.publishSigned.value,
     sbtrelease.ReleasePlugin.autoImport.releaseCrossBuild := true,
     scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8"),

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=1.1.0

project/plugins.sbt

@@ -1,9 +1,9 @@
 resolvers += Classpaths.sbtPluginReleases
 
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
-
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7")
 
 // documentation
-addSbtPlugin("com.fortysevendeg"  % "sbt-microsites" % "0.4.0")
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.0")
+addSbtPlugin("com.47deg"  % "sbt-microsites" % "0.7.14")
+addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1")

samples/issue907/build.sbt

@@ -1,21 +1,21 @@
 scalaVersion := "2.11.7"
 
-libraryDependencies ++= Seq( jdbc , cache , ws   , specs2 % Test )
+Test / unmanagedResourceDirectories += baseDirectory.value / "target/web/public/test"
 
-unmanagedResourceDirectories in Test <+=  baseDirectory ( _ /"target/web/public/test" )  
-
-resolvers += "scalaz-bintray" at "https://dl.bintray.com/scalaz/releases"
-
-resolvers += DefaultMavenRepository
-
-resolvers += "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/snapshots"
-
-resolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
-
-resolvers += "Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/"
+resolvers ++= Seq(
+  DefaultMavenRepository,
+  "scalaz-bintray" at "https://dl.bintray.com/scalaz/releases",
+  "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/snapshots",
+  "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
+  "Sonatype Releases" at "https://oss.sonatype.org/content/repositories/releases/"
+)
 
 libraryDependencies ++= Seq(
+  jdbc,
+  cache,
+  ws,
+  specs2 % Test,
   "com.sksamuel.elastic4s" %% "elastic4s-core" % "5.4.2",
   "com.sksamuel.elastic4s" %% "elastic4s-tcp" % "5.4.2",
   "com.sksamuel.elastic4s" %% "elastic4s-http" % "5.4.2"
-)
+)

samples/issue907/project/build.properties

@@ -0,0 +1 @@
+sbt.version=1.1.0

samples/issue907/project/plugins.sbt

@@ -1,7 +1,6 @@
 logLevel := Level.Warn
 
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
-
 resolvers += "Typesafe Snapshots" at "http://repo.typesafe.com/typesafe/snapshots/"
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.2")