From 9eff5f340239e5802e2eb123e4cb08616e802fe8 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sun, 5 Mar 2017 15:47:41 +0100 Subject: [PATCH] Have publishSigned publish artifacts with shading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.0.0-M15-3 -> 🗑️ --- build.sbt | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 138c2a28a..4c342a3ef 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,5 @@ import java.io.FileOutputStream +import com.typesafe.sbt.pgp.PgpSettings val binaryCompatibilityVersion = "1.0.0-M14" val binaryCompatibility212Version = "1.0.0-M15" @@ -16,10 +17,8 @@ lazy val core = crossProject .enablePlugins(_root_.coursier.ShadingPlugin) ) .jvmSettings( - shadingNamespace := "coursier.shaded", libraryDependencies += "com.lihaoyi" %% "fastparse" % "0.4.2" % "shaded", - publish := publish.in(Shading).value, - publishLocal := publishLocal.in(Shading).value + shadingSettings ) .jsSettings( libraryDependencies += "com.lihaoyi" %%% "fastparse" % "0.4.2" @@ -391,7 +390,6 @@ lazy val `sbt-shading` = project .dependsOn(`sbt-coursier`) .settings(pluginSettings) .settings( - shadingNamespace := "coursier.shaded", resolvers += Resolver.mavenLocal, libraryDependencies += { val coursierJarjarVersion = "1.0.1-coursier-SNAPSHOT" @@ -416,8 +414,7 @@ lazy val `sbt-shading` = project "org.anarres.jarjar" % "jarjar-core" % jarjarVersion % "shaded" }, - publish := publish.in(Shading).value, - publishLocal := publishLocal.in(Shading).value + shadingSettings ) lazy val `sbt-launcher` = project @@ -658,3 +655,16 @@ lazy val mimaPreviousArtifactSettings = Seq( Set(organization.value %% moduleName.value % version) } ) + +lazy val shadingSettings = + inConfig(Shading)(PgpSettings.projectSettings) ++ + // ytf does this have to be repeated here? + // Can't figure out why configuration get lost without this in particular... + _root_.coursier.ShadingPlugin.projectSettings ++ + Seq( + shadingNamespace := "coursier.shaded", + publish := publish.in(Shading).value, + publishLocal := publishLocal.in(Shading).value, + PgpKeys.publishSigned := PgpKeys.publishSigned.in(Shading).value, + PgpKeys.publishLocalSigned := PgpKeys.publishLocalSigned.in(Shading).value + )