1
1
import scalariform .formatter .preferences ._
2
2
3
- import bintray .Plugin .bintrayPublishSettings
4
3
import com .typesafe .sbt .SbtScalariform ._
5
4
import sbt .Keys ._
6
5
import sbt ._
7
6
import sbtassembly .AssemblyPlugin .autoImport ._
8
7
import spray .revolver .RevolverPlugin ._
8
+ import bintray .Plugin .bintrayPublishSettings
9
+ import scoverage .ScoverageKeys ._
9
10
10
11
// There are advantages to using real Scala build files with SBT:
11
12
// - Multi-JVM testing won't work without it, for now
@@ -198,6 +199,7 @@ object JobServerBuild extends Build {
198
199
resolvers ++= Dependencies .repos,
199
200
libraryDependencies ++= apiDeps,
200
201
parallelExecution in Test := false ,
202
+
201
203
// We need to exclude jms/jmxtools/etc because it causes undecipherable SBT errors :(
202
204
ivyXML :=
203
205
<dependencies >
@@ -208,9 +210,8 @@ object JobServerBuild extends Build {
208
210
) ++ scalariformPrefs ++ scoverageSettings
209
211
210
212
lazy val scoverageSettings = {
211
- import scoverage .ScoverageSbtPlugin
212
213
// Semicolon-separated list of regexs matching classes to exclude
213
- ScoverageSbtPlugin . ScoverageKeys . coverageExcludedPackages := " .+Benchmark.*"
214
+ coverageExcludedPackages := " .+Benchmark.*"
214
215
}
215
216
216
217
lazy val publishSettings = bintrayPublishSettings ++ Seq (
@@ -225,7 +226,8 @@ object JobServerBuild extends Build {
225
226
.setPreference(AlignParameters , true )
226
227
.setPreference(AlignSingleLineCaseStatements , true )
227
228
.setPreference(DoubleIndentClassDeclaration , true )
228
- .setPreference(PreserveDanglingCloseParenthesis , false )
229
+ // This was deprecated.
230
+ // .setPreference(PreserveDanglingCloseParenthesis, false)
229
231
)
230
232
231
233
// This is here so we can easily switch back to Logback when Spark fixes its log4j dependency.
0 commit comments