Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CORE-69: Minor and patch updates - sbt-assembly to 2.3.1 - liquibase-core to 4.31.0 - sbt-scalafmt to 2.5.4 - reactor-netty to 1.2.2 - grpc-core to 1.69.1 - scalafmt-core to 3.8.5 - scala-library to 2.13.16 - postgresql to 42.7.5 - sbt-scoverage to 2.3.0 #1630

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
+10 −10
Open

CORE-69: Minor and patch updates - sbt-assembly to 2.3.1 - liquibase-core to 4.31.0 - sbt-scalafmt to 2.5.4 - reactor-netty to 1.2.2 - grpc-core to 1.69.1 - scalafmt-core to 3.8.5 - scala-library to 2.13.16 - postgresql to 42.7.5 - sbt-scoverage to 2.3.0 #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f6b3409
CORE-69: Update sbt-assembly from 2.3.0 to 2.3.1
broadbot Jan 20, 2025
56e7fdf
CORE-69: Update grpc-core from 1.69.0 to 1.69.1
broadbot Jan 20, 2025
49f217c
CORE-69: Update reactor-netty from 1.2.1 to 1.2.2
broadbot Jan 20, 2025
6086a92
CORE-69: Update liquibase-core from 4.30.0 to 4.31.0
broadbot Jan 20, 2025
34b5066
CORE-69: Update postgresql from 42.7.4 to 42.7.5
broadbot Jan 20, 2025
91046ca
CORE-69: Update scala-library from 2.13.15 to 2.13.16
broadbot Jan 20, 2025
e34352b
CORE-69: Update sbt-scalafmt from 2.5.2 to 2.5.4
broadbot Jan 20, 2025
e984de0
CORE-69: Update sbt-scoverage from 2.2.2 to 2.3.0
broadbot Jan 20, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/verify_consumer_pacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ jobs:
-e JANITOR_CLIENT_CREDENTIAL_FILE_PATH="" \
-e JANITOR_TRACK_RESOURCE_PROJECT_ID="" \
-e JANITOR_TRACK_RESOURCE_TOPIC_ID="" \
sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.15 \
sbtscala/scala-sbt:eclipse-temurin-17.0.13_11_1.10.7_2.13.16 \
bash -c "git config --global --add safe.directory /working/sam && sbt \"set scalafmtOnCompile := false\" \"project pact4s\" \"testOnly *SamProviderSpec\""

can-i-deploy: # The can-i-deploy job will run as a result of a Sam PR. It reports the pact verification statuses on all deployed environments.
Expand Down
2 changes: 1 addition & 1 deletion automation/project/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object Settings {
val commonSettings =
commonBuildSettings ++ testSettings ++ List(
organization := "org.broadinstitute.dsde.firecloud",
scalaVersion := "2.13.15",
scalaVersion := "2.13.16",
resolvers ++= commonResolvers,
scalacOptions ++= commonCompilerSettings
)
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Dependencies {
val scalaTestV = "3.2.19"
val scalaCheckV = "1.18.1"
val scalikejdbcVersion = "3.4.2"
val postgresDriverVersion = "42.7.4"
val postgresDriverVersion = "42.7.5"
val sentryVersion = "6.15.0"

val workbenchLibV = "fa46370" // If updating this, make sure googleStorageLocal in test dependencies is up-to-date
Expand Down Expand Up @@ -65,10 +65,10 @@ object Dependencies {
val scalaCheck: ModuleID = "org.scalacheck" %% "scalacheck" % scalaCheckV % "test"

val nettyAll: ModuleID = "io.netty" % "netty-all" % "4.1.116.Final"
val reactorNetty: ModuleID = "io.projectreactor.netty" % "reactor-netty" % "1.2.1"
val reactorNetty: ModuleID = "io.projectreactor.netty" % "reactor-netty" % "1.2.2"

val excludIoGrpc = ExclusionRule(organization = "io.grpc", name = "grpc-core")
val ioGrpc: ModuleID = "io.grpc" % "grpc-core" % "1.69.0"
val ioGrpc: ModuleID = "io.grpc" % "grpc-core" % "1.69.1"

val googleOAuth2: ModuleID = "com.google.auth" % "google-auth-library-oauth2-http" % "0.18.0" excludeAll excludIoGrpc
val googleStorage: ModuleID = "com.google.apis" % "google-api-services-storage" % "v1-rev20241206-2.0.0" excludeAll excludIoGrpc // force this version
Expand Down Expand Up @@ -116,7 +116,7 @@ object Dependencies {
val googleStorageLocal: ModuleID =
"com.google.cloud" % "google-cloud-nio" % "0.127.29" % "test" // needed for mocking google cloud storage. Should use same version as wb-libs

val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.30.0"
val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.31.0"

val circeYAML: ModuleID = "io.circe" %% "circe-yaml" % "0.16.0"
val snakeYAML: ModuleID = "org.yaml" % "snakeyaml" % "2.3"
Expand Down
2 changes: 1 addition & 1 deletion project/Settings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ object Settings {
lazy val commonSettings =
commonBuildSettings ++ commonAssemblySettings ++ commonTestSettings ++ List(
organization := "org.broadinstitute.dsde.workbench",
scalaVersion := "2.13.15",
scalaVersion := "2.13.16",
resolvers := proxyResolvers ++: resolvers.value ++: commonResolvers,
scalacOptions ++= commonCompilerSettings,
Compile / compile := (Compile / compile).dependsOn(Compile / scalafmtAll).value,
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")

addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")

Expand Down
Loading