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

Jump to bottom

chore: update dependencies #2281

Merged
merged 6 commits into from Nov 7, 2022
Merged

chore: update dependencies #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f37c506
update ZIO core
BalduinLandolt Nov 7, 2022
f908736
update spring security
BalduinLandolt Nov 7, 2022
b395637
update scalafmt
BalduinLandolt Nov 7, 2022
d9cc5bf
update kamon
BalduinLandolt Nov 7, 2022
f058537
update zio-logging
BalduinLandolt Nov 7, 2022
e576a00
update jackson-databind
BalduinLandolt Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
@@ -1,4 +1,4 @@
version = "3.6.0"
version = "3.6.1"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
12 changes: 6 additions & 6 deletions project/Dependencies.scala
View file
Open in desktop
Expand Up @@ -20,12 +20,12 @@ object Dependencies {
val AkkaHttpVersion = "10.2.10"
val JenaVersion = "4.6.1"

val ZioVersion = "2.0.2"
val ZioVersion = "2.0.3"
val ZioHttpVersion = "2.0.0-RC4"
val ZioJsonVersion = "0.3.0"
val ZioConfigVersion = "3.0.2"
val ZioSchemaVersion = "0.2.0"
val ZioLoggingVersion = "2.1.2"
val ZioLoggingVersion = "2.1.3"
val ZioMetricsConnectorsVersion = "2.0.0"
val ZioPreludeVersion = "1.0.0-RC16"

Expand Down Expand Up @@ -62,8 +62,8 @@ object Dependencies {

// Metrics
val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.9.1"
val kamonCore = "io.kamon" %% "kamon-core" % "2.5.9" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.5.9" // Scala 3 incompatible
val kamonCore = "io.kamon" %% "kamon-core" % "2.5.11" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.5.11" // Scala 3 incompatible

// input validation
val commonsValidator =
Expand All @@ -73,7 +73,7 @@ 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" % "5.7.4" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
"org.springframework.security" % "spring-security-core" % "5.7.5" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.72"

// caching
Expand All @@ -96,7 +96,7 @@ object Dependencies {
val scallop = "org.rogach" %% "scallop" % "4.1.0" // Scala 3 compatible
val titaniumJSONLD = "com.apicatalog" % "titanium-json-ld" % "1.3.1"
val xmlunitCore = "org.xmlunit" % "xmlunit-core" % "2.9.0"
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.13.4.2"
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.14.0"

// test
val akkaHttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % AkkaHttpVersion // Scala 3 incompatible
Expand Down
2 changes: 1 addition & 1 deletion webapi/src/main/scala/org/knora/webapi/Main.scala
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ object Main extends ZIOApp {
* and cleaned up when the Runtime is shutdown.
*/
override def bootstrap: ZLayer[
ZIOAppArgs with Scope,
seakayone marked this conversation as resolved.
Show resolved Hide resolved
ZIOAppArgs,
Any,
Environment
] = ZLayer.empty ++ Runtime.removeDefaultLoggers ++ SLF4J.slf4j ++ core.LayersLive.dspLayersLive
Expand Down