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

WM-2378: Set of scala steward updates #2657

Merged
merged 12 commits into from
Dec 6, 2023
Merged

WM-2378: Set of scala steward updates #2657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
55f1095
Update sbt-scalafmt from 2.5.0 to 2.5.2
broadbot Sep 4, 2023
8d1e092
Update antlr4, antlr4-runtime from 4.13.0 to 4.13.1
broadbot Sep 11, 2023
02e1b31
Update guava from 32.1.2-jre to 32.1.3-jre
broadbot Oct 16, 2023
c7c794e
Update terra common lib to 0.0.95-SNAPSHOT
cjllanwarne Dec 6, 2023
508f069
Update mysql-connector-j from 8.1.0 to 8.2.0
broadbot Oct 30, 2023
eb6b403
Update google-cloud-nio from 0.127.2 to 0.127.7
broadbot Nov 6, 2023
a1b6cae
Update webjars-locator from 0.46 to 0.50
broadbot Nov 27, 2023
d18135b
Update workspace-manager-client from 0.254.950-SNAPSHOT to 0.254.967-…
broadbot Dec 4, 2023
111df94
Update commons-io from 2.13.0 to 2.15.1
broadbot Dec 4, 2023
ba4fff8
Update scalafmt-core from 3.7.12 to 3.7.17
broadbot Nov 20, 2023
035905b
Reformat with scalafmt 3.7.17
broadbot Nov 20, 2023
3d87838
Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs
broadbot Nov 20, 2023
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ b9cc35b06928aa1792fee88af0419d5087a7a800

# Scala Steward: Reformat with scalafmt 3.7.12
8448f2850081d53520aec809b0d678e0866a73c0

# Scala Steward: Reformat with scalafmt 3.7.17
a4933777d38af3b80fdf1d70bf1f5cac3b84ec9d
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.12
version = 3.7.17
align = none
align.openParenCallSite = true
align.openParenDefnSite = true
Expand Down
2 changes: 1 addition & 1 deletion automation/project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ object Dependencies {
val workbenchGoogle2: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-google2" % workbenchGoogle2V exclude ("org.slf4j", "slf4j-api")
val workbenchServiceTest: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-service-test" % serviceTestV % "test" classifier "tests" excludeAll(workbenchExclusions :+ rawlsModelExclusion:_*)

val workspaceManager: ModuleID = "bio.terra" % "workspace-manager-client" % "0.254.950-SNAPSHOT"
val workspaceManager: ModuleID = "bio.terra" % "workspace-manager-client" % "0.254.967-SNAPSHOT"
val dataRepo: ModuleID = "bio.terra" % "datarepo-client" % "1.41.0-SNAPSHOT"
val dataRepoJersey : ModuleID = "org.glassfish.jersey.inject" % "jersey-hk2" % "2.32" // scala-steward:off (must match TDR)

Expand Down
4 changes: 2 additions & 2 deletions automation/src/test/scala/org/broadinstitute/dsde/test/pipeline/PipelineInjector.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ trait PipelineInjector {
seq <- json.as[Seq[UserMetadata]]
} yield seq
userMetadataSeq match {
case Right(u) => u
case Left(_) => Seq()
case Right(u) => u
case Left(_) => Seq()
}
case _ => Seq()
}
Expand Down
2 changes: 1 addition & 1 deletion automation/src/test/scala/org/broadinstitute/dsde/test/pipeline/UserMetadata.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ case class UserMetadata(email: String, `type`: UserType, bearer: String) {
* Companion object containing some useful methods for UserMetadata.
*/
object UserMetadata {
//implicit val userMetadataDecoder: Decoder[UserMetadata] = deriveDecoder[UserMetadata]
// implicit val userMetadataDecoder: Decoder[UserMetadata] = deriveDecoder[UserMetadata]
implicit val userMetadataDecoder: Decoder[UserMetadata] = (c: HCursor) =>
for {
email <- c.downField("email").as[String]
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/broadinstitute/dsde/rawls/dataaccess/slick/DataAccess.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.broadinstitute.dsde.rawls.dataaccess.slick

import org.broadinstitute.dsde.rawls.entities.local.LocalEntityExpressionQueries
import org.broadinstitute.dsde.rawls.monitor.migration.{MultiregionalBucketMigrationHistory}
import org.broadinstitute.dsde.rawls.monitor.migration.MultiregionalBucketMigrationHistory
import slick.jdbc.JdbcProfile

import javax.naming.NameNotFoundException
Expand Down
1 change: 0 additions & 1 deletion core/src/test/scala/org/broadinstitute/dsde/rawls/jobexec/WorkflowSubmissionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ class WorkflowSubmissionSpec(_system: ActorSystem)
}
}


it should "submit a workflow with the right zones for a regional bucket" in withDefaultTestDatabase {
val mockExecCluster = MockShardedExecutionServiceCluster.fromDAO(new MockExecutionServiceDAO(), slickDataSource)
val workflowSubmission = new TestWorkflowSubmission(
Expand Down
16 changes: 8 additions & 8 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ object Dependencies {
val googleCompute: ModuleID = "com.google.apis" % "google-api-services-compute" % ("v1-rev20230119-" + googleV)
val googlePubSub: ModuleID = "com.google.apis" % "google-api-services-pubsub" % ("v1-rev20230112-" + googleV)
val accessContextManager: ModuleID = "com.google.apis" % "google-api-services-accesscontextmanager" % ("v1-rev20230109-" + googleV)
val googleGuava: ModuleID = "com.google.guava" % "guava" % "32.1.2-jre"
val googleGuava: ModuleID = "com.google.guava" % "guava" % "32.1.3-jre"

// metrics4-scala and metrics3-statsd are pulled in by workbench-metrics, which is pulled in by
// workbench-google (workbenchGoogle variable in this file). Thus, anything that depends on workbench-google, such as
Expand All @@ -66,7 +66,7 @@ object Dependencies {
val jodaConvert: ModuleID = "org.joda" % "joda-convert" % "2.2.3"
val typesafeConfig: ModuleID = "com.typesafe" % "config" % "1.4.3"
val sentryLogback: ModuleID = "io.sentry" % "sentry-logback" % "6.28.0"
val webjarsLocator: ModuleID = "org.webjars" % "webjars-locator" % "0.46"
val webjarsLocator: ModuleID = "org.webjars" % "webjars-locator" % "0.50"
val commonsJEXL: ModuleID = "org.apache.commons" % "commons-jexl" % "2.1.1"
val cats: ModuleID = "org.typelevel" %% "cats-core" % "2.10.0"
val logbackClassic: ModuleID = "ch.qos.logback" % "logback-classic" % "1.4.14"
Expand All @@ -76,9 +76,9 @@ object Dependencies {
val mockserverNetty: ModuleID = "org.mock-server" % "mockserver-netty" % "5.15.0" % "test"
val breeze: ModuleID = "org.scalanlp" %% "breeze" % "1.2" % "test"
val ficus: ModuleID = "com.iheart" %% "ficus" % "1.5.2"
val apacheCommonsIO: ModuleID = "commons-io" % "commons-io" % "2.13.0"
val antlrParser: ModuleID = "org.antlr" % "antlr4-runtime" % "4.13.0"
val mysqlConnector: ModuleID = "com.mysql" % "mysql-connector-j" % "8.1.0"
val apacheCommonsIO: ModuleID = "commons-io" % "commons-io" % "2.15.1"
val antlrParser: ModuleID = "org.antlr" % "antlr4-runtime" % "4.13.1"
val mysqlConnector: ModuleID = "com.mysql" % "mysql-connector-j" % "8.2.0"
val liquibaseCore: ModuleID = "org.liquibase" % "liquibase-core" % "4.17.2"

val workbenchLibsHash = "8ccaa6d"
Expand All @@ -104,7 +104,7 @@ object Dependencies {
val workbenchOpenTelemetry: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-opentelemetry" % workbenchOpenTelemetryV
val workbenchOpenTelemetryTests: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-opentelemetry" % workbenchOpenTelemetryV classifier "tests"

val googleStorageLocal: ModuleID = "com.google.cloud" % "google-cloud-nio" % "0.127.2" % "test"
val googleStorageLocal: ModuleID = "com.google.cloud" % "google-cloud-nio" % "0.127.7" % "test"

val workbenchUtil: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-util" % s"0.10-${workbenchLibsHash}"

Expand All @@ -126,11 +126,11 @@ object Dependencies {
// "Terra Common Lib" Exclusions:
def tclExclusions(m: ModuleID): ModuleID = m.excludeAll(excludeSpringBoot, excludeSpringAop, excludeSpringData, excludeSpringFramework, excludeOpenCensus, excludeGoogleFindBugs, excludeBroadWorkbench, excludePostgresql, excludeSnakeyaml, excludeSlf4j)

val workspaceManager = excludeJakarta("bio.terra" % "workspace-manager-client" % "0.254.950-SNAPSHOT")
val workspaceManager = excludeJakarta("bio.terra" % "workspace-manager-client" % "0.254.967-SNAPSHOT")
val dataRepo = excludeJakarta("bio.terra" % "datarepo-client" % "1.379.0-SNAPSHOT")
val resourceBufferService = excludeJakarta("bio.terra" % "terra-resource-buffer-client" % "0.4.3-SNAPSHOT")
val billingProfileManager = excludeJakarta("bio.terra" % "billing-profile-manager-client-javax" % "0.1.236-SNAPSHOT")
val terraCommonLib = tclExclusions(excludeJakarta("bio.terra" % "terra-common-lib" % "0.0.93-SNAPSHOT" classifier "plain"))
val terraCommonLib = tclExclusions(excludeJakarta("bio.terra" % "terra-common-lib" % "0.0.95-SNAPSHOT" classifier "plain"))
val sam: ModuleID = excludeJakarta("org.broadinstitute.dsde.workbench" %% "sam-client" % "0.1-d606036")
val leonardo: ModuleID = "org.broadinstitute.dsde.workbench" % "leonardo-client_2.13" % "1.3.6-d0bf371"

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7")

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

addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.3")

Expand Down
Loading