From e4ff2d225ede945988e346c09f915de3dea0f263 Mon Sep 17 00:00:00 2001
From: Yaroslav Biletskyi <yaroslav.biletskyi.96@gmail.com>
Date: Wed, 31 Jul 2024 21:42:25 +0300
Subject: [PATCH] Remove OkHttp3 ProGuard rules (#2665)

---
 .../android/MapLibreAndroid/proguard-rules.pro   | 16 +---------------
 render-test/android/build.gradle                 |  2 +-
 test/android/build.gradle                        |  2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/platform/android/MapLibreAndroid/proguard-rules.pro b/platform/android/MapLibreAndroid/proguard-rules.pro
index 809a0bcb0..ade0552c2 100644
--- a/platform/android/MapLibreAndroid/proguard-rules.pro
+++ b/platform/android/MapLibreAndroid/proguard-rules.pro
@@ -17,11 +17,6 @@
 -dontnote org.maplibre.android.maps.MapLibreMapOptions
 -dontnote org.maplibre.android.log.LoggerDefinition
 
-# config for okhttp 3.11.0, https://github.com/square/okhttp/pull/3354
--dontwarn javax.annotation.**
--dontnote okhttp3.internal.**
--dontwarn org.codehaus.**
-
 # config for mapbox-sdk-geojson:3.0.1
 -keep class org.maplibre.geojson.** { *; }
 -dontwarn com.google.auto.value.**
@@ -37,13 +32,4 @@
 # while we don't include this dependency directly
 # a large amount of users combine it with our SDK
 # we aren't able to provide a proguard config in that project (jar vs aar)
--dontwarn com.sun.xml.internal.ws.spi.db.*
-
-# okhttp
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.*
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
\ No newline at end of file
+-dontwarn com.sun.xml.internal.ws.spi.db.*
\ No newline at end of file
diff --git a/render-test/android/build.gradle b/render-test/android/build.gradle
index 5475934b7..90d3f4045 100644
--- a/render-test/android/build.gradle
+++ b/render-test/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 
diff --git a/test/android/build.gradle b/test/android/build.gradle
index 18b17e2b3..f79fd3f1e 100644
--- a/test/android/build.gradle
+++ b/test/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }