From 171b3d63cb01c06518f372cd7c9b2072be84d8d0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 4 Sep 2025 10:52:32 +0000
Subject: [PATCH 1/2] chore: update scripts/update-java.ps1 to 8.20.0

---
 CHANGELOG.md                                               | 3 +++
 src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abeff7e4fc..f0454a3469 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,9 @@
 - Bump CLI from v2.52.0 to v2.53.0 ([#4486](https://github.com/getsentry/sentry-dotnet/pull/4486))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2530)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.52.0...2.53.0)
+- Bump Java SDK from v8.6.0 to v8.20.0 ([#4496](https://github.com/getsentry/sentry-dotnet/pull/4496))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8200)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.6.0...8.20.0)
 
 ## 5.14.1
 
diff --git a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
index 632b8ba146..27092bbed6 100644
--- a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
+++ b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net8.0-android34.0;net9.0-android35.0</TargetFrameworks>
-    <SentryAndroidSdkVersion>8.6.0</SentryAndroidSdkVersion>
+    <SentryAndroidSdkVersion>8.20.0</SentryAndroidSdkVersion>
     <SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\$(TargetFramework)\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
     <!-- This gets resolved by the DownloadSentryAndroidSdk target -->
     <SentryNativeNdkVersion></SentryNativeNdkVersion>

From 60c90e8e70f7da7e97b5c18245c0ed45fe0bfa57 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 4 Sep 2025 13:17:33 +0200
Subject: [PATCH 2/2] Remove conflicting SentryUserFeedbackDialog.Builder

---
 src/Sentry.Bindings.Android/Transforms/Metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Sentry.Bindings.Android/Transforms/Metadata.xml b/src/Sentry.Bindings.Android/Transforms/Metadata.xml
index 9dd30189d6..fb6b6558da 100644
--- a/src/Sentry.Bindings.Android/Transforms/Metadata.xml
+++ b/src/Sentry.Bindings.Android/Transforms/Metadata.xml
@@ -138,6 +138,7 @@
   <remove-node path="/api/package[@name='io.sentry.android.core.cache']/class[@name='AndroidEnvelopeCache']" />
   <remove-node path="/api/package[@name='io.sentry.android.core.internal.gestures']" />
   <remove-node path="/api/package[@name='io.sentry.android.core.performance']" />
+  <remove-node path="/api/package[@name='io.sentry.android.core']/class[@name='SentryUserFeedbackDialog.Builder']" />
 
   <remove-node path="/api/package[starts-with(@name,'io.sentry')]/*/method[@name='clone' and count(parameter)=0]" />
   <remove-node path="/api/package[starts-with(@name,'io.sentry')]/class/implements[@name='io.sentry.JsonDeserializer']" />