From 82920376050bc03f076f9b1dcfa860576e54b908 Mon Sep 17 00:00:00 2001 From: "scala-steward-asf[bot]" <147768647+scala-steward-asf[bot]@users.noreply.github.com> Date: Sun, 13 Oct 2024 00:04:28 +0000 Subject: [PATCH 1/4] Update sbt-assembly to 2.3.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 20c9f32407..a7a7d9edf6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ * This file is part of the Apache Pekko project, which was derived from Akka. */ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2") From 08d0e5a941cb39b4d005021bbaae74eefee9b563 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 16 Oct 2024 21:59:23 +0100 Subject: [PATCH 2/4] build fails with changing exportJars to false --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d93f55ee67..1615d30bd5 100644 --- a/build.sbt +++ b/build.sbt @@ -361,7 +361,7 @@ lazy val protobufV3 = pekkoModule("protobuf-v3") .inProject), assembly / assemblyOption := (assembly / assemblyOption).value.withIncludeScala(false).withIncludeBin(true), autoScalaLibrary := false, // do not include scala dependency in pom - exportJars := true, // in dependent projects, use assembled and shaded jar + exportJars := false, // in dependent projects, use assembled and shaded jar makePomConfiguration := makePomConfiguration.value .withConfigurations(Vector(Compile)), // prevent original dependency to be added to pom as runtime dep Compile / packageBin / packagedArtifact := Scoped.mkTuple2( From 786eb67e7a32df454e3b74bc5005b50736d7036f Mon Sep 17 00:00:00 2001 From: "He-Pin(kerr)" Date: Mon, 20 Jan 2025 11:38:24 +0800 Subject: [PATCH 3/4] Apply suggestions from code review --- build.sbt | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 1615d30bd5..d93f55ee67 100644 --- a/build.sbt +++ b/build.sbt @@ -361,7 +361,7 @@ lazy val protobufV3 = pekkoModule("protobuf-v3") .inProject), assembly / assemblyOption := (assembly / assemblyOption).value.withIncludeScala(false).withIncludeBin(true), autoScalaLibrary := false, // do not include scala dependency in pom - exportJars := false, // in dependent projects, use assembled and shaded jar + exportJars := true, // in dependent projects, use assembled and shaded jar makePomConfiguration := makePomConfiguration.value .withConfigurations(Vector(Compile)), // prevent original dependency to be added to pom as runtime dep Compile / packageBin / packagedArtifact := Scoped.mkTuple2( diff --git a/project/plugins.sbt b/project/plugins.sbt index a7a7d9edf6..66fea45bb7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ * This file is part of the Apache Pekko project, which was derived from Akka. */ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2") From a379265053b6665828f38ce6fff29a996fce52a0 Mon Sep 17 00:00:00 2001 From: "He-Pin(kerr)" Date: Mon, 20 Jan 2025 11:46:16 +0800 Subject: [PATCH 4/4] Update build.sbt --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d93f55ee67..1615d30bd5 100644 --- a/build.sbt +++ b/build.sbt @@ -361,7 +361,7 @@ lazy val protobufV3 = pekkoModule("protobuf-v3") .inProject), assembly / assemblyOption := (assembly / assemblyOption).value.withIncludeScala(false).withIncludeBin(true), autoScalaLibrary := false, // do not include scala dependency in pom - exportJars := true, // in dependent projects, use assembled and shaded jar + exportJars := false, // in dependent projects, use assembled and shaded jar makePomConfiguration := makePomConfiguration.value .withConfigurations(Vector(Compile)), // prevent original dependency to be added to pom as runtime dep Compile / packageBin / packagedArtifact := Scoped.mkTuple2(