diff --git a/project/Build.scala b/project/Build.scala index c595ecb64..e6a7c8716 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -5,6 +5,8 @@ import sbt.Keys._ import sbt._ import sbtassembly.AssemblyPlugin.autoImport._ import spray.revolver.RevolverPlugin._ +import com.typesafe.sbt.SbtScalariform._ +import scalariform.formatter.preferences._ import bintray.Plugin.bintrayPublishSettings import scoverage.ScoverageKeys._ @@ -159,14 +161,15 @@ object JobServerBuild extends Build { Tags.limitSum(1, Tags.Test, Tags.Untagged)) ) - lazy val revolverSettings = Revolver.settings ++ Seq( - javaOptions in Revolver.reStart += jobServerLogging, + import spray.revolver.RevolverPlugin.autoImport._ + lazy val revolverSettings = Seq( + javaOptions in reStart += jobServerLogging, // Give job server a bit more PermGen since it does classloading - javaOptions in Revolver.reStart += "-XX:MaxPermSize=256m", - javaOptions in Revolver.reStart += "-Djava.security.krb5.realm= -Djava.security.krb5.kdc=", + javaOptions in reStart += "-XX:MaxPermSize=256m", + javaOptions in reStart += "-Djava.security.krb5.realm= -Djava.security.krb5.kdc=", // This lets us add Spark back to the classpath without assembly barfing - fullClasspath in Revolver.reStart := (fullClasspath in Compile).value, - mainClass in Revolver.reStart := Some("spark.jobserver.JobServer") + fullClasspath in reStart := (fullClasspath in Compile).value, + mainClass in reStart := Some("spark.jobserver.JobServer") ) // To add an extra jar to the classpath when doing "re-start" for quick development, set the diff --git a/project/plugins.sbt b/project/plugins.sbt index c6d2db6f8..07b30b2ad 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,9 @@ addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10") - -addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2") // For quick restarts for web development +addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.1") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") @@ -18,4 +17,4 @@ addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.3") addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5") -addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.2.0") +addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.3.0")