From e8b968e3cdb0feced3e4fd1b098fa2356b8c22fe Mon Sep 17 00:00:00 2001 From: Alexander Bessonov Date: Mon, 18 Jun 2018 19:01:24 -0400 Subject: [PATCH 1/2] Add shaded artifact for Spotify implementation --- .gitignore | 1 + build.sbt | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2cb1511..21ee01b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ target/ +target-shaded/ project/sbt-launch-*.jar .idea/ diff --git a/build.sbt b/build.sbt index df9a396..d97e386 100644 --- a/build.sbt +++ b/build.sbt @@ -36,7 +36,7 @@ lazy val root = .in(file(".")) .settings(commonSettings: _*) .settings(publish := {}, publishLocal := {}, packagedArtifacts := Map.empty) - .aggregate(core, testkitSpotifyImpl, testkitDockerJavaImpl, config, scalatest, specs2, samples) + .aggregate(core, testkitSpotifyImpl, testkitSpotifyShadedImpl, testkitDockerJavaImpl, config, scalatest, specs2, samples) lazy val core = project @@ -54,6 +54,23 @@ lazy val testkitSpotifyImpl = "com.google.code.findbugs" % "jsr305" % "3.0.1")) .dependsOn(core) +lazy val testkitSpotifyShadedImpl = + project + .in(file("impl/spotify")) + .settings(commonSettings: _*) + .settings(name := "docker-testkit-impl-spotify", + libraryDependencies ++= + Seq("com.spotify" % "docker-client" % "8.11.5" classifier "shaded", + "com.google.code.findbugs" % "jsr305" % "3.0.1"), + artifactClassifier := Some("shaded"), + artifact in makePom := { + val art = (artifact in makePom).value + art.withClassifier(Some("shaded")) + }, + target := baseDirectory.value / "target-shaded" + ) + .dependsOn(core) + lazy val testkitDockerJavaImpl = project .in(file("impl/docker-java")) From 42e884533d764b16fe978a3ef8ec7d92062c6526 Mon Sep 17 00:00:00 2001 From: Alexander Bessonov Date: Thu, 21 Jun 2018 11:20:44 -0400 Subject: [PATCH 2/2] Produce separate artifact for shaded library --- build.sbt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index d97e386..2abba70 100644 --- a/build.sbt +++ b/build.sbt @@ -58,15 +58,10 @@ lazy val testkitSpotifyShadedImpl = project .in(file("impl/spotify")) .settings(commonSettings: _*) - .settings(name := "docker-testkit-impl-spotify", + .settings(name := "docker-testkit-impl-spotify-shaded", libraryDependencies ++= Seq("com.spotify" % "docker-client" % "8.11.5" classifier "shaded", "com.google.code.findbugs" % "jsr305" % "3.0.1"), - artifactClassifier := Some("shaded"), - artifact in makePom := { - val art = (artifact in makePom).value - art.withClassifier(Some("shaded")) - }, target := baseDirectory.value / "target-shaded" ) .dependsOn(core)