From 8cc8d9e422cc785080c3483444ee5a9a21f84c94 Mon Sep 17 00:00:00 2001 From: spenes Date: Mon, 12 Feb 2024 14:55:12 +0300 Subject: [PATCH] Stop publishing fat jars (close #862) --- .github/workflows/release.yml | 20 ------------------- project/BuildSettings.scala | 36 ++++------------------------------- project/plugins.sbt | 1 - 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c42310ca2..173439fcd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,26 +21,6 @@ jobs: - name: Get current version id: ver run: echo "::set-output name=tag::${GITHUB_REF#refs/tags/}" - - name: Assemble fat jars - run: | - sbt "project pubsub; set assembly / test := {}; assembly" \ - "project kinesis; set assembly / test := {}; assembly" \ - "project kafka; set assembly / test := {}; assembly" \ - "project nsq; set assembly / test := {}; assembly" - - name: Create GitHub release and attach artifacts - uses: softprops/action-gh-release@v1 - with: - draft: true - prerelease: ${{ contains(steps.ver.outputs.tag, 'rc') }} - name: ${{ steps.ver.outputs.tag }} - tag_name: ${{ steps.ver.outputs.tag }} - files: | - modules/pubsub/target/scala-2.12/snowplow-enrich-pubsub-${{ steps.ver.outputs.tag }}.jar - modules/kinesis/target/scala-2.12/snowplow-enrich-kinesis-${{ steps.ver.outputs.tag }}.jar - modules/kafka/target/scala-2.12/snowplow-enrich-kafka-${{ steps.ver.outputs.tag }}.jar - modules/nsq/target/scala-2.12/snowplow-enrich-nsq-${{ steps.ver.outputs.tag }}.jar - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish_docker: if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/snapshot') diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index 779b91206..7001f53cf 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -12,7 +12,6 @@ import sbt._ import sbt.Keys._ import sbt.nio.Keys.{ReloadOnSourceChanges, onChangedBuildSource} -import sbtassembly.AssemblyPlugin.autoImport._ import sbtbuildinfo.BuildInfoPlugin.autoImport.{BuildInfoKey, buildInfoKeys, buildInfoPackage} import sbtdynver.DynVerPlugin.autoImport._ import com.typesafe.sbt.SbtNativePackager.autoImport._ @@ -147,33 +146,6 @@ object BuildSettings { ) ) - lazy val assemblySettings = Seq( - assembly / assemblyJarName := { s"${moduleName.value}-${version.value}.jar" }, - assembly / assemblyMergeStrategy := { - case x if x.endsWith(".properties") => MergeStrategy.first - case x if x.endsWith("public-suffix-list.txt") => MergeStrategy.first - case x if x.endsWith("ProjectSettings$.class") => MergeStrategy.first - case x if x.endsWith("module-info.class") => MergeStrategy.first - case x if x.endsWith("nowarn.class") => MergeStrategy.first - case x if x.endsWith("nowarn$.class") => MergeStrategy.first - case x if x.endsWith("log4j.properties") => MergeStrategy.first - case x if x.endsWith(".proto") => MergeStrategy.first - case x if x.endsWith("reflection-config.json") => MergeStrategy.first - case x if x.endsWith("config.fmpp") => MergeStrategy.first - case x if x.contains("simulacrum") => MergeStrategy.first - case x if x.endsWith("git.properties") => MergeStrategy.discard - case x if x.endsWith(".json") => MergeStrategy.first - case x if x.endsWith("AUTHORS") => MergeStrategy.first - case x if x.endsWith(".config") => MergeStrategy.first - case x if x.endsWith(".types") => MergeStrategy.first - case x if x.contains("netty") => MergeStrategy.first - case x if x.contains("FastDoubleParser-NOTICE") => MergeStrategy.first - case x => - val oldStrategy = (assembly / assemblyMergeStrategy).value - oldStrategy(x) - } - ) - lazy val dockerSettingsFocal = Seq( Universal / javaOptions ++= Seq("-Dnashorn.args=--language=es6") ) @@ -250,7 +222,7 @@ object BuildSettings { // Project pubsubProjectSettings ++ buildSettings ++ // Build and publish - assemblySettings ++ dockerSettingsFocal ++ + dockerSettingsFocal ++ Seq(Docker / packageName := "snowplow-enrich-pubsub") ++ // Tests scoverageSettings ++ noParallelTestExecution ++ addExampleConfToTestCp @@ -262,7 +234,7 @@ object BuildSettings { // Project kinesisProjectSettings ++ buildSettings ++ // Build and publish - assemblySettings ++ dockerSettingsFocal ++ + dockerSettingsFocal ++ Seq(Docker / packageName := "snowplow-enrich-kinesis") ++ // Tests scoverageSettings ++ noParallelTestExecution ++ Seq(Test / fork := true) ++ addExampleConfToTestCp @@ -274,7 +246,7 @@ object BuildSettings { // Project kafkaProjectSettings ++ buildSettings ++ // Build and publish - assemblySettings ++ dockerSettingsFocal ++ + dockerSettingsFocal ++ Seq(Docker / packageName := "snowplow-enrich-kafka") ++ // Tests scoverageSettings ++ noParallelTestExecution ++ addExampleConfToTestCp @@ -286,7 +258,7 @@ object BuildSettings { // Project nsqProjectSettings ++ buildSettings ++ // Build and publish - assemblySettings ++ dockerSettingsFocal ++ + dockerSettingsFocal ++ Seq(Docker / packageName := "snowplow-enrich-nsq") ++ // Tests scoverageSettings ++ noParallelTestExecution ++ addExampleConfToTestCp diff --git a/project/plugins.sbt b/project/plugins.sbt index 269e50c4e..5ed1caaa7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,3 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.17")