Skip to content

Commit

Permalink
Merge branch 'main' into update/all
Browse files Browse the repository at this point in the history
  • Loading branch information
BalduinLandolt authored Dec 16, 2023
2 parents 0f3f9c9 + 0cc64d1 commit 55eef30
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ object Dependencies {

val ScalaVersion = "2.13.12"

val PekkoActorVersion = "1.0.1"
val PekkoActorVersion = "1.0.2"
val PekkoHttpVersion = "1.0.0"
val JenaVersion = "4.10.0"

val ZioConfigVersion = "3.0.7"
val ZioLoggingVersion = "2.1.16"
val ZioNioVersion = "2.0.2"
val ZioMetricsConnectorsVersion = "2.2.1"
val ZioMetricsConnectorsVersion = "2.3.0"
val ZioPreludeVersion = "1.0.0-RC21"
val ZioSchemaVersion = "0.2.0"
val ZioVersion = "2.0.19"
val ZioVersion = "2.0.20"

// ZIO - all Scala 3 compatible
val zio = "dev.zio" %% "zio" % ZioVersion
Expand Down Expand Up @@ -70,8 +70,8 @@ object Dependencies {

// Metrics
val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.21"
val kamonCore = "io.kamon" %% "kamon-core" % "2.6.6" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.6.6" // Scala 3 incompatible
val kamonCore = "io.kamon" %% "kamon-core" % "2.7.0" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.7.0" // Scala 3 incompatible

// input validation
val commonsValidator =
Expand Down Expand Up @@ -121,15 +121,15 @@ object Dependencies {
// found/added by the plugin but deleted anyway
val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.14.0"

val tapirVersion = "1.9.3"
val tapirVersion = "1.9.5"

val tapir = Seq(
"com.softwaremill.sttp.tapir" %% "tapir-pekko-http-server" % tapirVersion,
"com.softwaremill.sttp.tapir" %% "tapir-zio-http-server" % tapirVersion,
"com.softwaremill.sttp.tapir" %% "tapir-json-zio" % tapirVersion,
"com.softwaremill.sttp.tapir" %% "tapir-json-spray" % tapirVersion,
"com.softwaremill.sttp.tapir" %% "tapir-swagger-ui-bundle" % tapirVersion,
"com.softwaremill.sttp.tapir" %% "tapir-refined" % "1.9.3"
"com.softwaremill.sttp.tapir" %% "tapir-refined" % "1.9.5"
)
val metrics = Seq(
"dev.zio" %% "zio-metrics-connectors" % ZioMetricsConnectorsVersion,
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.7
sbt.version=1.9.8
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ resolvers ++= Seq(

addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2")
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.2")
addSbtPlugin("org.playframework.twirl" % "sbt-twirl" % "2.0.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.8")
// also update the scalac-scoverage-runtime version in build.sbt
Expand Down

0 comments on commit 55eef30

Please sign in to comment.