sbt 1.0.1

Author: viktortnk

.travis.yml

@@ -9,15 +9,15 @@ before_install:
 language: scala
 
 scala:
-  - 2.12.2
-  - 2.11.8
+  - 2.12.3
+  - 2.11.11
 
 jdk:
   - oraclejdk8
 
 script:
-  - sbt "scalatest/test-only com.whisk.docker.MongodbServiceSpec" #spotify executor
-  - sbt "scalatest/test-only com.whisk.docker.ElasticsearchServiceSpec"  #docker-java executor
+  - sbt "scalatest/testOnly com.whisk.docker.MongodbServiceSpec" #spotify executor
+  - sbt "scalatest/testOnly com.whisk.docker.ElasticsearchServiceSpec"  #docker-java executor
 
 cache:
   directories:

build.sbt

@@ -1,24 +1,12 @@
-def latestScalafmt = "1.0.0-RC4"
-
-commands += Command.args("scalafmt", "Run scalafmt cli.") {
-  case (state, args) =>
-    val Right(scalafmt) =
-      org.scalafmt.bootstrap.ScalafmtBootstrap.fromVersion(latestScalafmt)
-    scalafmt.main("--non-interactive" +: args.toArray)
-    state
-}
-
 lazy val commonSettings = Seq(
   organization := "com.whisk",
   version := "0.9.4",
-  scalaVersion := "2.12.2",
-  crossScalaVersions := Seq("2.12.2", "2.11.11", "2.10.6"),
+  scalaVersion := "2.12.3",
+  crossScalaVersions := Seq("2.12.3", "2.11.11", "2.10.6"),
   scalacOptions ++= Seq("-feature", "-deprecation"),
   fork in Test := true,
   licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
   sonatypeProfileName := "com.whisk",
-  // TODO Remove once this workaround no longer needed (https://github.com/sbt/sbt/issues/2786):
-  ivyScala := { ivyScala.value map { _.copy(overrideScalaVersion = sbtPlugin.value) } },
   pomExtra in Global := {
     <url>https://github.com/whisklabs/docker-it-scala</url>
       <scm>

project/build.properties

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

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
 
-libraryDependencies += "com.geirsson" %% "scalafmt-bootstrap" % "0.6.6"
+addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.2.0")