Skip to content

Commit

Permalink
Merge branch 'main' into update/scalatest-3.2.17
Browse files Browse the repository at this point in the history
  • Loading branch information
Shon Feder authored Sep 12, 2023
2 parents 491c88f + 403eb14 commit b3f4a66
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.13"
version = "3.7.14"

runner.dialect = scala213
fileOverride {
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ object Dependencies {
val scalaParserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % "2.3.0"
val scalaCollectionContrib = "org.scala-lang.modules" %% "scala-collection-contrib" % "0.3.0"
val scalaz = "org.scalaz" %% "scalaz-core" % "7.3.5"
val slf4j = "org.slf4j" % "slf4j-api" % "2.0.7"
val slf4j = "org.slf4j" % "slf4j-api" % "2.0.9"
val shapeless = "com.chuusai" %% "shapeless" % "2.3.10"
val tla2tools = "org.lamport" % "tla2tools" % "1.7.0-SNAPSHOT"
val ujson = "com.lihaoyi" %% "ujson" % "3.1.2"
Expand All @@ -40,7 +40,7 @@ object Dependencies {
val zio = "dev.zio" %% "zio" % zioVersion
// Keep up to sync with version in plugins.sbt
val zioGrpcCodgen = "com.thesamet.scalapb.zio-grpc" %% "zio-grpc-codegen" % "0.6.0-test3" % "provided"
val grpcNetty = "io.grpc" % "grpc-netty" % "1.57.2"
val grpcNetty = "io.grpc" % "grpc-netty" % "1.58.0"
val scalapbRuntimGrpc =
"com.thesamet.scalapb" %% "scalapb-runtime-grpc" % scalapb.compiler.Version.scalapbVersion
// Ensures we have access to commonly used protocol buffers (e.g., google.protobuf.Struct)
Expand All @@ -54,7 +54,7 @@ object Dependencies {
// Libraries
val junit = "junit" % "junit" % "4.13.2" % Test
val scalacheck = "org.scalacheck" %% "scalacheck" % "1.17.0" % Test
val easymock = "org.easymock" % "easymock" % "5.1.0" % Test
val easymock = "org.easymock" % "easymock" % "5.2.0" % Test

val scalaTestVersion = "3.2.17"
val scalatest = "org.scalatest" %% "scalatest" % scalaTestVersion % Test
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// https://scalameta.org/scalafmt/docs/installation.html#sbt
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
// https://github.com/sbt/sbt-assembly
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.2.0")
// https://github.com/marcuslonnberg/sbt-docker
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.11.0")
// https://github.com/scoverage/sbt-scoverage
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
// https://github.com/sbt/sbt-buildinfo
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
// https://github.com/sbt/sbt-native-packager
Expand Down

0 comments on commit b3f4a66

Please sign in to comment.