Skip to content

Commit 31c90ab

Browse files
authored
Fix sonatype release (#532)
* Update orb/plugins/scala
1 parent d21bdef commit 31c90ab

File tree

6 files changed

+23
-22
lines changed

6 files changed

+23
-22
lines changed

.circleci/config.yml

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

33
orbs:
4-
codacy: codacy/base@10.11.0
4+
codacy: codacy/base@12.2.0
55
slack: circleci/[email protected]
66

77
references:
@@ -146,7 +146,8 @@ workflows:
146146
write_sbt_version: true
147147
- codacy/sbt:
148148
name: compile
149-
install_sbt_version: 1.8.2
149+
install_sbt_version: 1.10.5
150+
openjdk_version: '17'
150151
cmd: sbt coverage +test:compile
151152
cache_prefix: *cache_prefix
152153
persist_to_workspace: true
@@ -184,15 +185,17 @@ workflows:
184185
- codacy/checkout_and_version
185186
- codacy/sbt:
186187
name: lint
187-
install_sbt_version: 1.8.2
188+
install_sbt_version: 1.10.5
189+
openjdk_version: '17'
188190
cmd: |
189191
sbt "scalafmtCheckAll;scalafmtSbtCheck;scapegoat;scalafixEnable;scalafix --test"
190192
cache_prefix: *cache_prefix
191193
requires:
192194
- compile
193195
- codacy/sbt:
194196
name: test
195-
install_sbt_version: 1.8.2
197+
install_sbt_version: 1.10.5
198+
openjdk_version: '17'
196199
cmd: |
197200
git config --global user.email "[email protected]"
198201
git config --global user.name "Codacy Team"
@@ -203,7 +206,8 @@ workflows:
203206
- compile
204207
- codacy/sbt:
205208
name: publish_docker_locally
206-
install_sbt_version: 1.8.2
209+
install_sbt_version: 1.10.5
210+
openjdk_version: '17'
207211
cmd: |
208212
sbt "set codacyAnalysisCli / version := \"dev-snapshot\";
209213
codacyAnalysisCli/stage"
@@ -228,7 +232,8 @@ workflows:
228232
# - maven_dependencies
229233
- codacy/sbt:
230234
name: publish_lib
231-
install_sbt_version: 1.8.2
235+
install_sbt_version: 1.10.5
236+
openjdk_version: '17'
232237
context: CodacyAWS
233238
cmd: |
234239
sbt "retrieveGPGKeys;
@@ -255,6 +260,7 @@ workflows:
255260
- codacy/sbt:
256261
name: build_cli_jar
257262
install_sbt_version: 1.8.2
263+
openjdk_version: '17'
258264
persist_to_workspace: true
259265
cmd: |
260266
sbt "set codacyAnalysisCli / version := \"$(cat .version)\";

build.sbt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ val assemblyCommon = Seq(
1616
oldStrategy(x)
1717
})
1818

19-
inThisBuild(
20-
Seq(
21-
scalaVersion := Common.scalaVersionNumber,
22-
scalaBinaryVersion := Common.scalaBinaryVersionNumber,
23-
scapegoatDisabledInspections := Seq(),
24-
scapegoatVersion := "1.4.6"))
19+
inThisBuild(Seq(scalaVersion := Common.scalaVersionNumber, scalaBinaryVersion := Common.scalaBinaryVersionNumber))
2520

2621
val sonatypeInformation = Seq(
2722
startYear := Some(2018),

project/Common.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ object Common {
1111

1212
private val defaultDockerInstallationPath = "/opt/codacy"
1313
val scalaBinaryVersionNumber = "2.12"
14-
val scalaVersionNumber = s"$scalaBinaryVersionNumber.12"
14+
val scalaVersionNumber = s"$scalaBinaryVersionNumber.19"
1515

1616
val scala213BinaryVersionNumber = "2.13"
17-
val scala213VersionNumber = s"$scala213BinaryVersionNumber.3"
17+
val scala213VersionNumber = s"$scala213BinaryVersionNumber.16"
1818
lazy val supportedScalaVersions = List(Common.scalaVersionNumber, Common.scala213VersionNumber)
1919

2020
val genericSettings = Seq(

project/Dependencies.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Dependencies {
66
val circeVersion = "0.12.3"
77
val specs2Version = "4.8.1"
88
val codacyApiVersion = "26.20.0"
9-
val silencerVersion = "1.7.0"
9+
val silencerVersion = "1.7.19"
1010

1111
lazy val circe = List(
1212
"io.circe" %% "circe-core" % circeVersion,
@@ -42,8 +42,8 @@ object Dependencies {
4242

4343
lazy val typesafeConfig = "com.typesafe" % "config" % "1.4.0"
4444

45-
val akkaVersion = "2.5.26"
46-
val akkaHttpVersion = "10.1.9"
45+
val akkaVersion = "2.6.20"
46+
val akkaHttpVersion = "10.2.10"
4747

4848
val akka =
4949
Seq(

project/build.properties

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

project/plugins.sbt

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

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

66
// Static Analysis
7-
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.0")
8-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.21")
7+
addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.13")
8+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
99

1010
// Dependencies
11-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
11+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
1212

1313
// Swagger code generation
1414
addSbtPlugin("com.twilio" % "sbt-guardrail" % "0.59.0")

0 commit comments

Comments
 (0)