Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
codacy: codacy/base@10.11.0
codacy: codacy/base@12.2.0
slack: circleci/[email protected]

references:
Expand Down Expand Up @@ -146,7 +146,8 @@ workflows:
write_sbt_version: true
- codacy/sbt:
name: compile
install_sbt_version: 1.8.2
install_sbt_version: 1.10.5
openjdk_version: '17'
cmd: sbt coverage +test:compile
cache_prefix: *cache_prefix
persist_to_workspace: true
Expand Down Expand Up @@ -184,15 +185,17 @@ workflows:
- codacy/checkout_and_version
- codacy/sbt:
name: lint
install_sbt_version: 1.8.2
install_sbt_version: 1.10.5
openjdk_version: '17'
cmd: |
sbt "scalafmtCheckAll;scalafmtSbtCheck;scapegoat;scalafixEnable;scalafix --test"
cache_prefix: *cache_prefix
requires:
- compile
- codacy/sbt:
name: test
install_sbt_version: 1.8.2
install_sbt_version: 1.10.5
openjdk_version: '17'
cmd: |
git config --global user.email "[email protected]"
git config --global user.name "Codacy Team"
Expand All @@ -203,7 +206,8 @@ workflows:
- compile
- codacy/sbt:
name: publish_docker_locally
install_sbt_version: 1.8.2
install_sbt_version: 1.10.5
openjdk_version: '17'
cmd: |
sbt "set codacyAnalysisCli / version := \"dev-snapshot\";
codacyAnalysisCli/stage"
Expand All @@ -228,7 +232,8 @@ workflows:
# - maven_dependencies
- codacy/sbt:
name: publish_lib
install_sbt_version: 1.8.2
install_sbt_version: 1.10.5
openjdk_version: '17'
context: CodacyAWS
cmd: |
sbt "retrieveGPGKeys;
Expand All @@ -255,6 +260,7 @@ workflows:
- codacy/sbt:
name: build_cli_jar
install_sbt_version: 1.8.2
openjdk_version: '17'
persist_to_workspace: true
cmd: |
sbt "set codacyAnalysisCli / version := \"$(cat .version)\";
Expand Down
7 changes: 1 addition & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,7 @@ val assemblyCommon = Seq(
oldStrategy(x)
})

inThisBuild(
Seq(
scalaVersion := Common.scalaVersionNumber,
scalaBinaryVersion := Common.scalaBinaryVersionNumber,
scapegoatDisabledInspections := Seq(),
scapegoatVersion := "1.4.6"))
inThisBuild(Seq(scalaVersion := Common.scalaVersionNumber, scalaBinaryVersion := Common.scalaBinaryVersionNumber))

val sonatypeInformation = Seq(
startYear := Some(2018),
Expand Down
4 changes: 2 additions & 2 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ object Common {

private val defaultDockerInstallationPath = "/opt/codacy"
val scalaBinaryVersionNumber = "2.12"
val scalaVersionNumber = s"$scalaBinaryVersionNumber.12"
val scalaVersionNumber = s"$scalaBinaryVersionNumber.19"

val scala213BinaryVersionNumber = "2.13"
val scala213VersionNumber = s"$scala213BinaryVersionNumber.3"
val scala213VersionNumber = s"$scala213BinaryVersionNumber.16"
lazy val supportedScalaVersions = List(Common.scalaVersionNumber, Common.scala213VersionNumber)

val genericSettings = Seq(
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ object Dependencies {
val circeVersion = "0.12.3"
val specs2Version = "4.8.1"
val codacyApiVersion = "26.20.0"
val silencerVersion = "1.7.0"
val silencerVersion = "1.7.19"

lazy val circe = List(
"io.circe" %% "circe-core" % circeVersion,
Expand Down Expand Up @@ -42,8 +42,8 @@ object Dependencies {

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

val akkaVersion = "2.5.26"
val akkaHttpVersion = "10.1.9"
val akkaVersion = "2.6.20"
val akkaHttpVersion = "10.2.10"

val akka =
Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.5
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
addSbtPlugin("com.codacy" % "codacy-sbt-plugin" % "25.2.4")

// Coverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.6")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")

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

// Dependencies
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")

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