From 75e279bb2071bab718b4e4bfc1375649b5cb6ed9 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Wed, 29 Mar 2023 10:38:58 +0200
Subject: [PATCH] build.gradle: update SLF4J to 2.0.7

---
 oeffi/build.gradle | 2 +-
 oeffi/proguard.cfg | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/oeffi/build.gradle b/oeffi/build.gradle
index fd99b25..47e7cf5 100644
--- a/oeffi/build.gradle
+++ b/oeffi/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13'
     implementation 'com.google.guava:guava:31.1-android'
     implementation 'org.osmdroid:osmdroid-android:6.1.14'
-    implementation 'org.slf4j:slf4j-api:1.7.36'
+    implementation 'org.slf4j:slf4j-api:2.0.7'
     implementation 'com.github.tony19:logback-android:3.0.0'
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg
index 0c6bf6f..1566d6d 100644
--- a/oeffi/proguard.cfg
+++ b/oeffi/proguard.cfg
@@ -78,12 +78,8 @@
 -dontnote com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper
 -dontnote dalvik.system.CloseGuard
 
-# slf4j
--dontwarn org.slf4j.spi.SLF4JServiceProvider
--dontwarn org.slf4j.LoggerFactory
--dontwarn ch.qos.logback.classic.Logger
-
-# logback-android
+# SLF4J, logback-android
+-keep class org.slf4j.impl.LoggerServiceProvider
 -dontwarn javax.mail.**
 -dontnote ch.qos.logback.core.android.AndroidContextUtil