diff --git a/build.sbt b/build.sbt index 40a6424b8..e1170f161 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import Dependencies._ import Path._ -def commonSettings: Seq[Setting[_]] = Seq( +def commonSettings: Seq[Setting[_]] = Def settings ( scalaVersion := scala212, // publishArtifact in packageDoc := false, resolvers += Resolver.typesafeIvyRepo("releases"), @@ -21,6 +21,7 @@ def commonSettings: Seq[Setting[_]] = Seq( case _ => old ++ List("-Ywarn-unused", "-Ywarn-unused-import", "-YdisableFlatCpCaching") } }, + inCompileAndTest(scalacOptions in console --= Vector("-Ywarn-unused-import", "-Ywarn-unused", "-Xlint")), publishArtifact in Compile := true, publishArtifact in Test := false, parallelExecution in Test := false @@ -114,8 +115,6 @@ lazy val lmCommonTest = (project in file("common-test")) skip in publish := true, name := "common-test", libraryDependencies ++= Seq(scalaTest, scalaCheck), - scalacOptions in (Compile, console) --= - Vector("-Ywarn-unused-import", "-Ywarn-unused", "-Xlint"), mimaSettings, ) @@ -171,3 +170,6 @@ inThisBuild(Seq( whitesourceFailOnError := sys.env.contains("WHITESOURCE_PASSWORD"), // fail if pwd is present whitesourceForceCheckAllDependencies := true, )) + +def inCompileAndTest(ss: SettingsDefinition*): Seq[Setting[_]] = + Seq(Compile, Test) flatMap (inConfig(_)(Def.settings(ss: _*)))