Skip to content

Commit 2fe2c4f

Browse files
committed
Revert "Add provided scope to external build tools"
This reverts commit 6b612a8.
1 parent 850f0ae commit 2fe2c4f

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

build.sbt

+15-6
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,26 @@ libraryDependencies ++= Seq(
1717
"org.apache.commons" % "commons-compress" % "1.14",
1818
// for jdkpackager
1919
"org.apache.ant" % "ant" % "1.10.1",
20-
"org.scalatest" %% "scalatest" % "3.0.3" % Test,
21-
// these dependencies have to be explicitly added by the user
22-
"com.spotify" % "docker-client" % "3.5.13" % Provided,
23-
"org.vafer" % "jdeb" % "1.3" % Provided artifacts Artifact("jdeb", "jar", "jar")
20+
"org.scalatest" %% "scalatest" % "3.0.3" % Test
2421
)
2522

2623
// sbt dependend libraries
2724
libraryDependencies ++= {
2825
(sbtVersion in pluginCrossBuild).value match {
29-
case v if v.startsWith("1.") => Seq("org.scala-sbt" %% "io" % "1.0.0")
30-
case _ => Seq.empty
26+
case v if v.startsWith("1.") =>
27+
Seq(
28+
"org.scala-sbt" %% "io" % "1.0.0",
29+
// these dependencies have to be explicitly added by the user
30+
// FIXME temporary remove the 'provided' scope. SBT 1.0.0-M6 changed the resolving somehow
31+
"com.spotify" % "docker-client" % "3.5.13" /* % "provided" */,
32+
"org.vafer" % "jdeb" % "1.3" /*% "provided"*/ artifacts Artifact("jdeb", "jar", "jar")
33+
)
34+
case _ =>
35+
Seq(
36+
// these dependencies have to be explicitly added by the user
37+
"com.spotify" % "docker-client" % "3.5.13" % Provided,
38+
"org.vafer" % "jdeb" % "1.3" % Provided artifacts Artifact("jdeb", "jar", "jar")
39+
)
3140
}
3241
}
3342

0 commit comments

Comments
 (0)