Skip to content

Commit 2de4109

Browse files
committed
clean: Fix deprecation warnings in Sbt build
- Remove old unused plugins
1 parent 525db1e commit 2de4109

4 files changed

Lines changed: 8 additions & 11 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ workflows:
227227
persist_to_workspace: true
228228
cmd: |
229229
sbt "set codacyAnalysisCli / version := \"$(cat .version)\";
230-
set test in assembly := {};
230+
set assembly / test := {};
231231
codacyAnalysisCli/assembly"
232232
mkdir -p ~/workdir/artifacts/
233233
mv ./cli/target/scala-2.12/codacy-analysis-cli-assembly-$(cat .version).jar ~/workdir/artifacts/

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ import sbt._
77
Universal / javaOptions ++= Seq("-Xms1g", "-Xmx2g", "-Xss512m", "-XX:+UseG1GC", "-XX:+UseStringDeduplication")
88

99
val assemblyCommon = Seq(
10-
test in assembly := {},
10+
assembly / test := {},
1111
// Without this assembly merge strategy, gives the following error:
1212
// (codacyAnalysisCli / assembly) deduplicate: different file contents found in the following:
1313
// [error] org/bouncycastle/bcpg-jdk15on/1.64/bcpg-jdk15on-1.64.jar:META-INF/versions/9/module-info.class
1414
// Workaround:
1515
// https://stackoverflow.com/questions/54834125/sbt-assembly-deduplicate-module-info-class
16-
assemblyMergeStrategy in assembly := {
16+
assembly / assemblyMergeStrategy := {
1717
case "META-INF/versions/9/module-info.class" => MergeStrategy.discard
1818
case x =>
19-
val oldStrategy = (assemblyMergeStrategy in assembly).value
19+
val oldStrategy = (assembly / assemblyMergeStrategy).value
2020
oldStrategy(x)
2121
})
2222

project/Common.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ object Common {
3131
Compile / doc / sources := Seq.empty)
3232

3333
val dockerSettings: Seq[Def.Setting[_]] = Seq(
34-
packageName in Docker := packageName.value,
35-
version in Docker := version.value,
36-
maintainer in Docker := "Rodrigo Fernandes <rodrigo@codacy.com>",
34+
Docker / packageName := packageName.value,
35+
Docker / version := version.value,
3736
dockerBaseImage := "openjdk:8-jre-alpine",
38-
defaultLinuxInstallLocation in Docker := defaultDockerInstallationPath,
39-
daemonUser in Docker := "root",
37+
Docker / defaultLinuxInstallLocation := defaultDockerInstallationPath,
38+
Docker / daemonUser := "root",
4039
dockerEntrypoint := Seq(s"$defaultDockerInstallationPath/bin/${name.value}"),
4140
dockerCmd := Seq(),
4241
dockerCommands := dockerCommands.value.flatMap {

project/plugins.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0")
88
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
99

1010
// Dependencies
11-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
12-
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1")
1311
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
1412

1513
// Swagger code generation

0 commit comments

Comments
 (0)