From 1904f87fc41620a806d9b625197ce03ccd01f3e0 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Thu, 21 May 2026 04:26:50 +0000
Subject: [PATCH 1/2] chore: update scripts/update-java.ps1 to 8.42.0

---
 src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
index f4209e88d9..796cbb7894 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>$(LatestAndroidTfm);$(PreviousAndroidTfm)</TargetFrameworks>
-    <SentryAndroidSdkVersion>8.40.0</SentryAndroidSdkVersion>
+    <SentryAndroidSdkVersion>8.42.0</SentryAndroidSdkVersion>
     <SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\$(TargetFramework)\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
     <!-- This gets resolved by the DownloadSentryAndroidSdk unless using local maven references -->
     <SentryNativeNdkVersion></SentryNativeNdkVersion>

From 5d186e483994e8f042226cc621b5e312ff49dc88 Mon Sep 17 00:00:00 2001
From: James Crosswell <james.crosswell@gmail.com>
Date: Fri, 22 May 2026 13:14:38 +1200
Subject: [PATCH 2/2] fix(android): drop deprecated SentryUserFeedbackDialog
 bindings

The Java SDK 8.41 release deprecated SentryUserFeedbackDialog in favor of
SentryUserFeedbackForm. The auto-generated C# bindings now produce CS0108
collisions because Dialog's nested IOptionsConfiguration /
IOptionsConfigurationInvoker share names with the ones on Form, and Form's
nested Builder collides with the inherited AlertDialog.Builder.

Remove the deprecated Dialog tree (we never exposed it) and rename Form's
nested Builder to SentryUserFeedbackFormBuilder so it no longer shadows
the inherited member.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/Sentry.Bindings.Android/Transforms/Metadata.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Sentry.Bindings.Android/Transforms/Metadata.xml b/src/Sentry.Bindings.Android/Transforms/Metadata.xml
index bf828efe1b..2ca7e45314 100644
--- a/src/Sentry.Bindings.Android/Transforms/Metadata.xml
+++ b/src/Sentry.Bindings.Android/Transforms/Metadata.xml
@@ -147,7 +147,13 @@
   <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 the deprecated SentryUserFeedbackDialog (and its nested types). Replaced by SentryUserFeedbackForm in Java SDK 8.41+.
+       The nested IOptionsConfiguration / IOptionsConfigurationInvoker collide with the same-named types on SentryUserFeedbackForm (CS0108). -->
+  <remove-node path="/api/package[@name='io.sentry.android.core']/class[starts-with(@name,'SentryUserFeedbackDialog')]" />
+
+  <!-- SentryUserFeedbackForm extends AlertDialog and declares a nested Builder that extends AlertDialog.Builder.
+       Rename the nested type so its C# name no longer collides with the inherited AlertDialog.Builder (CS0108). -->
+  <attr path="/api/package[@name='io.sentry.android.core']/class[@name='SentryUserFeedbackForm.Builder']" name="managedName">SentryUserFeedbackFormBuilder</attr>
 
   <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']" />