Skip to content

Commit e00521e

Browse files
authored
Merge pull request #469 from codacy/bump
bump: Update sbt, plugins and orbs
2 parents 3f150f2 + c36aa08 commit e00521e

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

.circleci/config.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
orbs:
4-
codacy: codacy/base@6.1.4
4+
codacy: codacy/base@10.1.0
55
slack: circleci/slack@3.3.0
66

77
references:
@@ -146,23 +146,23 @@ workflows:
146146
write_sbt_version: true
147147
- codacy/sbt:
148148
name: compile
149-
install_sbt_version: 1.6.1
149+
install_sbt_version: 1.8.2
150150
cmd: sbt coverage +test:compile
151151
cache_prefix: *cache_prefix
152152
persist_to_workspace: true
153153
requires:
154154
- codacy/checkout_and_version
155155
- codacy/sbt:
156156
name: lint
157-
install_sbt_version: 1.6.1
157+
install_sbt_version: 1.8.2
158158
cmd: |
159159
sbt "scalafmtCheckAll;scalafmtSbtCheck;scapegoat;scalafixEnable;scalafix --test"
160160
cache_prefix: *cache_prefix
161161
requires:
162162
- compile
163163
- codacy/sbt:
164164
name: test
165-
install_sbt_version: 1.6.1
165+
install_sbt_version: 1.8.2
166166
cmd: |
167167
git config --global user.email "team@codacy.com"
168168
git config --global user.name "Codacy Team"
@@ -173,7 +173,7 @@ workflows:
173173
- compile
174174
- codacy/sbt:
175175
name: publish_docker_locally
176-
install_sbt_version: 1.6.1
176+
install_sbt_version: 1.8.2
177177
cmd: |
178178
sbt "set codacyAnalysisCli / version := \"dev-snapshot\";
179179
codacyAnalysisCli/stage"
@@ -198,7 +198,7 @@ workflows:
198198
# - maven_dependencies
199199
- codacy/sbt:
200200
name: publish_lib
201-
install_sbt_version: 1.6.1
201+
install_sbt_version: 1.8.2
202202
context: CodacyAWS
203203
cmd: |
204204
sbt "retrieveGPGKeys;
@@ -224,7 +224,7 @@ workflows:
224224
- master
225225
- codacy/sbt:
226226
name: build_cli_jar
227-
install_sbt_version: 1.6.1
227+
install_sbt_version: 1.8.2
228228
persist_to_workspace: true
229229
cmd: |
230230
sbt "set codacyAnalysisCli / version := \"$(cat .version)\";

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.7.1
1+
sbt.version=1.8.2

project/plugins.sbt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "22.0.2")
1+
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "24.0.1")
22

33
// Coverage
4-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
4+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
55

66
// Static Analysis
77
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0")
@@ -12,3 +12,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
1212

1313
// Swagger code generation
1414
addSbtPlugin("com.twilio" % "sbt-guardrail" % "0.59.0")
15+
16+
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

0 commit comments

Comments
 (0)