mirror of https://github.com/sbt/sbt.git
Merge branch '1.x' into 1.x-eviction-summary
This commit is contained in:
commit
c7911b9062
|
|
@ -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
|
||||
|
|
@ -124,7 +125,7 @@ lazy val lmCommonTest = (project in file("common-test"))
|
|||
libraryDependencies ++= Seq(scalaTest, scalaCheck),
|
||||
scalacOptions in (Compile, console) --=
|
||||
Vector("-Ywarn-unused-import", "-Ywarn-unused", "-Xlint"),
|
||||
mimaSettings
|
||||
mimaSettings,
|
||||
)
|
||||
|
||||
lazy val lmIvy = (project in file("ivy"))
|
||||
|
|
@ -179,3 +180,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: _*)))
|
||||
|
|
|
|||
Loading…
Reference in New Issue