From 80daf5c5c6f2e90101b1e13e7a4221ce86914795 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Sun, 5 Nov 2023 21:51:25 +0100
Subject: [PATCH] build.gradle: update Guava to 32.1.3-android

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

diff --git a/oeffi/build.gradle b/oeffi/build.gradle
index 1a376d2..0f038e4 100644
--- a/oeffi/build.gradle
+++ b/oeffi/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:3.12.13'
     //noinspection GradleDependency
     implementation 'com.squareup.okhttp3:logging-interceptor:3.12.13'
-    implementation 'com.google.guava:guava:31.1-android'
+    implementation 'com.google.guava:guava:32.1.3-android'
     implementation 'org.osmdroid:osmdroid-android:6.1.14'
     implementation 'org.slf4j:slf4j-api:2.0.9'
     implementation 'com.github.tony19:logback-android:3.0.0'
diff --git a/oeffi/proguard.cfg b/oeffi/proguard.cfg
index 5ca66d9..8253ee2 100644
--- a/oeffi/proguard.cfg
+++ b/oeffi/proguard.cfg
@@ -71,15 +71,16 @@
 
 # Guava
 -dontwarn sun.misc.Unsafe
--dontwarn java.lang.ClassValue
--dontwarn com.google.errorprone.annotations.**
--dontwarn afu.org.checkerframework.checker.**,org.checkerframework.checker.**
+-dontwarn javax.lang.model.element.Modifier
+-dontwarn com.google.common.reflect.Invokable,com.google.common.reflect.Invokable$**
+-dontwarn java.lang.reflect.AnnotatedType
 -dontnote com.google.common.reflect.**
 -dontnote com.google.appengine.**
 -dontnote com.google.apphosting.**
 -dontnote com.google.common.cache.Striped64,com.google.common.cache.Striped64$Cell
 -dontnote com.google.common.hash.Striped64,com.google.common.hash.Striped64$Cell
 -dontnote com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper
+-dontnote com.google.common.io.TempFileCreator,com.google.common.io.TempFileCreator$**
 -dontnote dalvik.system.CloseGuard
 
 # SLF4J, logback-android