From b55d75ef992b8a58a1b87e2880dd0cf3451e1aaa Mon Sep 17 00:00:00 2001 From: AsamK Date: Wed, 9 Aug 2023 21:14:17 +0200 Subject: [PATCH] Update dependencies --- settings.gradle.kts | 6 +++--- src/main/java/org/asamk/signal/logging/LogConfigurator.java | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index a0290589..c698a36e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,14 +13,14 @@ dependencyResolutionManagement { version("slf4j", "2.0.7") library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j") library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j") - library("logback", "ch.qos.logback", "logback-classic").version("1.4.8") + library("logback", "ch.qos.logback", "logback-classic").version("1.4.10") library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_78") - library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0") + library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0") library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0") library("hikari", "com.zaxxer", "HikariCP").version("5.0.1") - library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.3") + library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0") } } } diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java index 114ad5ff..8571aff9 100644 --- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java +++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java @@ -9,6 +9,7 @@ import ch.qos.logback.classic.PatternLayout; import ch.qos.logback.classic.spi.Configurator; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.Context; import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.Layout; import ch.qos.logback.core.encoder.LayoutWrappingEncoder; @@ -34,7 +35,9 @@ public class LogConfigurator extends ContextAwareBase implements Configurator { LogConfigurator.scrubSensitiveInformation = scrubSensitiveInformation; } - public ExecutionStatus configure(LoggerContext lc) { + @Override + public ExecutionStatus configure(final Context context) { + LoggerContext lc = (LoggerContext) context; final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME); final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN; -- 2.50.1