Skip to content

Commit 16d1060

Browse files
Merge pull request #333 from codacy/fix-assembly-jar
fix: Add assembly strategy to new sbt modules
2 parents 09a36f6 + 02d84ac commit 16d1060

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ val assemblyCommon = Seq(
1919
val oldStrategy = (assemblyMergeStrategy in assembly).value
2020
oldStrategy(x)
2121
})
22+
2223
inThisBuild(
2324
Seq(
2425
scalaVersion := Common.scalaVersionNumber,
@@ -87,13 +88,15 @@ lazy val toolRepositoryPlugins = project
8788
.in(file("toolRepository-plugins"))
8889
.settings(Common.genericSettings)
8990
.settings(libraryDependencies ++= Dependencies.codacyPlugins)
91+
.settings(assemblyCommon: _*)
9092
// Disable legacy Scalafmt plugin imported by codacy-sbt-plugin
9193
.disablePlugins(com.lucidchart.sbt.scalafmt.ScalafmtCorePlugin)
9294
.dependsOn(codacyAnalysisCore, codacyAnalysisModels)
9395

9496
lazy val toolRepositoryRemote = project
9597
.in(file("toolRepository-remote"))
9698
.settings(Common.genericSettings, libraryDependencies ++= Dependencies.specs2)
99+
.settings(assemblyCommon: _*)
97100
// Disable legacy Scalafmt plugin imported by codacy-sbt-plugin
98101
.disablePlugins(com.lucidchart.sbt.scalafmt.ScalafmtCorePlugin)
99102
.dependsOn(codacyAnalysisCore, codacyAnalysisModels, codacyApiClient)

0 commit comments

Comments
 (0)