Update dependencies (#2732)

Co-authored-by: DaSCH Bot <50987250+daschbot@users.noreply.github.com>
dasch-swiss · Jul 3, 2023 · 3893599 · 3893599
1 parent 12402f3
commit 3893599
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.4"
+version = "3.7.5"
 runner.dialect = scala213
 maxColumn = 120
 align.preset = most

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -25,25 +25,26 @@ object Dependencies {
   val ZioJsonVersion              = "0.5.0"
   val ZioLoggingVersion           = "2.1.13"
   val ZioNioVersion               = "2.0.1"
-  val ZioMetricsConnectorsVersion = "2.0.8"
+  val ZioMetricsConnectorsVersion = "2.1.0"
   val ZioPreludeVersion           = "1.0.0-RC19"
   val ZioSchemaVersion            = "0.2.0"
   val ZioVersion                  = "2.0.15"
 
   // ZIO - all Scala 3 compatible
-  val zio                   = "dev.zio" %% "zio"                       % ZioVersion
-  val zioConfig             = "dev.zio" %% "zio-config"                % ZioConfigVersion
-  val zioConfigMagnolia     = "dev.zio" %% "zio-config-magnolia"       % ZioConfigVersion
-  val zioConfigTypesafe     = "dev.zio" %% "zio-config-typesafe"       % ZioConfigVersion
-  val zioHttpOld            = "io.d11"  %% "zhttp"                     % ZioHttpVersionOld
-  val zioHttp               = "dev.zio" %% "zio-http"                  % ZioHttpVersion
-  val zioJson               = "dev.zio" %% "zio-json"                  % ZioJsonVersion
-  val zioLogging            = "dev.zio" %% "zio-logging"               % ZioLoggingVersion
-  val zioLoggingSlf4jBridge = "dev.zio" %% "zio-logging-slf4j2-bridge" % ZioLoggingVersion
-  val zioNio                = "dev.zio" %% "zio-nio"                   % ZioNioVersion
-  val zioMacros             = "dev.zio" %% "zio-macros"                % ZioVersion
-  val zioMetricsConnectors  = "dev.zio" %% "zio-metrics-connectors"    % ZioMetricsConnectorsVersion
-  val zioPrelude            = "dev.zio" %% "zio-prelude"               % ZioPreludeVersion
+  val zio                           = "dev.zio" %% "zio"                               % ZioVersion
+  val zioConfig                     = "dev.zio" %% "zio-config"                        % ZioConfigVersion
+  val zioConfigMagnolia             = "dev.zio" %% "zio-config-magnolia"               % ZioConfigVersion
+  val zioConfigTypesafe             = "dev.zio" %% "zio-config-typesafe"               % ZioConfigVersion
+  val zioHttpOld                    = "io.d11"  %% "zhttp"                             % ZioHttpVersionOld
+  val zioHttp                       = "dev.zio" %% "zio-http"                          % ZioHttpVersion
+  val zioJson                       = "dev.zio" %% "zio-json"                          % ZioJsonVersion
+  val zioLogging                    = "dev.zio" %% "zio-logging"                       % ZioLoggingVersion
+  val zioLoggingSlf4jBridge         = "dev.zio" %% "zio-logging-slf4j2-bridge"         % ZioLoggingVersion
+  val zioNio                        = "dev.zio" %% "zio-nio"                           % ZioNioVersion
+  val zioMacros                     = "dev.zio" %% "zio-macros"                        % ZioVersion
+  val zioMetricsConnectors          = "dev.zio" %% "zio-metrics-connectors"            % ZioMetricsConnectorsVersion
+  val zioMetricsPrometheusConnector = "dev.zio" %% "zio-metrics-connectors-prometheus" % ZioMetricsConnectorsVersion
+  val zioPrelude                    = "dev.zio" %% "zio-prelude"                       % ZioPreludeVersion
 
   // zio-test and friends
   val zioTest    = "dev.zio" %% "zio-test"     % ZioVersion
@@ -67,8 +68,8 @@ object Dependencies {
 
   // Metrics
   val aspectjweaver    = "org.aspectj" % "aspectjweaver"      % "1.9.19"
-  val kamonCore        = "io.kamon"   %% "kamon-core"         % "2.6.1" // Scala 3 compatible
-  val kamonScalaFuture = "io.kamon"   %% "kamon-scala-future" % "2.6.1" // Scala 3 incompatible
+  val kamonCore        = "io.kamon"   %% "kamon-core"         % "2.6.3" // Scala 3 compatible
+  val kamonScalaFuture = "io.kamon"   %% "kamon-scala-future" % "2.6.3" // Scala 3 incompatible
 
   // input validation
   val commonsValidator =
@@ -78,8 +79,8 @@ object Dependencies {
   val jwtSprayJson = "com.github.jwt-scala" %% "jwt-spray-json" % "9.0.2"
   // jwtSprayJson -> 9.0.2 is the latest version that's compatible with spray-json; if it wasn't for spray, this would be Scala 3 compatible
   val springSecurityCore =
-    "org.springframework.security" % "spring-security-core" % "6.1.0" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
-  val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.73"
+    "org.springframework.security" % "spring-security-core" % "6.1.1" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
+  val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.75"
 
   // caching
   val ehcache = "net.sf.ehcache" % "ehcache" % "2.10.9.2"
@@ -173,6 +174,7 @@ object Dependencies {
     zioNio,
     zioMacros,
     zioMetricsConnectors,
+    zioMetricsPrometheusConnector,
     zioPrelude
   )
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.0
+sbt.version=1.9.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -10,7 +10,7 @@ addSbtPlugin("com.github.sbt"    % "sbt-native-packager" % "1.9.16")
 addSbtPlugin("io.kamon"          % "sbt-aspectj-runner"  % "1.1.2")
 addSbtPlugin("com.typesafe.play" % "sbt-twirl"           % "1.5.2")
 addSbtPlugin("com.eed3si9n"      % "sbt-assembly"        % "2.1.1")
-addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent"       % "0.1.6")
+addSbtPlugin("com.github.sbt"    % "sbt-javaagent"       % "0.1.7")
 // also update the scalac-scoverage-runtime version in build.sbt
 addSbtPlugin("org.scoverage"     % "sbt-scoverage" % "2.0.8")
 addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo" % "0.11.0")