Skip to content

Commit

Permalink
Merge branch 'main' into update/ujson-3.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Shon Feder authored Feb 23, 2024
2 parents 8b31694 + 3246fca commit 67cf469
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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.17"
version = "3.8.0"

runner.dialect = scala213
fileOverride {
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Dependencies {

object Deps {
// Versions
lazy val logbackVersion = "1.4.14"
lazy val logbackVersion = "1.5.0"
lazy val clistVersion = "3.5.1"

// Libraries
Expand All @@ -31,16 +31,16 @@ 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.11"
val slf4j = "org.slf4j" % "slf4j-api" % "2.0.12"
val shapeless = "com.chuusai" %% "shapeless" % "2.3.10"
val tla2tools = "org.lamport" % "tla2tools" % "1.7.0-SNAPSHOT"
val ujson = "com.lihaoyi" %% "ujson" % "3.1.5"
val upickle = "com.lihaoyi" %% "upickle" % "3.1.5"
val z3 = "tools.aqua" % "z3-turnkey" % "4.12.4"
val z3 = "tools.aqua" % "z3-turnkey" % "4.12.5"
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.61.0"
val grpcNetty = "io.grpc" % "grpc-netty" % "1.61.1"
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 Down

0 comments on commit 67cf469

Please sign in to comment.