From 4d6fe93c8055cdb624fb680376f0341431a69945 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Fri, 13 Mar 2026 03:43:51 +0000
Subject: [PATCH 1/3] chore: update scripts/update-java.ps1 to 8.35.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 57c61275ce..017b64f5ae 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.34.1</SentryAndroidSdkVersion>
+    <SentryAndroidSdkVersion>8.35.0</SentryAndroidSdkVersion>
     <SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\$(TargetFramework)\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
     <!-- This gets resolved by the DownloadSentryAndroidSdk unless using local maven references -->
     <SentryNativeNdkVersion></SentryNativeNdkVersion>

From 093521dff78ca108549736195b2036e51698de79 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 13 Mar 2026 09:12:21 +0100
Subject: [PATCH 2/3] Replace protobuf-javalite with epitaph

See also: https://github.com/getsentry/sentry-java/pull/5157
---
 src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
index 017b64f5ae..0febb8b73d 100644
--- a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
+++ b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
@@ -121,10 +121,9 @@
                        JavaArtifact="io.sentry:sentry-native-ndk:$(SentryNativeNdkVersion)" />
   </ItemGroup>
 
-  <!-- protobuf-javalite 3.25.8 has no matching/compatible Xamarin.Protobuf.JavaLite NuGet package
-       (see https://github.com/getsentry/sentry-java/pull/5044) -->
+  <!-- A light-weight replacement for protobuf-javalite (see https://github.com/getsentry/sentry-java/pull/5157) -->
   <ItemGroup>
-    <AndroidMavenLibrary Include="com.google.protobuf:protobuf-javalite" Version="3.25.8" Bind="false" />
+    <AndroidMavenLibrary Include="com.abovevacant:epitaph" Version="0.1.0" Bind="false" />
   </ItemGroup>
 
   <ItemGroup>

From f7707960a3aa7a23b44f86b87c0210e9e5e160e1 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 13 Mar 2026 09:25:48 +0100
Subject: [PATCH 3/3] Fix missing compareTo(Object) method for AnrStackTrace

  Sentry.Bindings.Android net10.0-android36.0 failed with 1 error(s) (2.6s)
    /Users/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net10.0-android36.0/generated/src/IO.Sentry.Android.Core.Anr.AnrStackTrace.cs(20,74): error CS0535: 'AnrStackTrace' does not implement interface member 'IComparable.CompareTo(Object)'
  Sentry.Bindings.Android net9.0-android35.0 failed with 1 error(s) (2.3s)
    /Users/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net9.0-android35.0/generated/src/IO.Sentry.Android.Core.Anr.AnrStackTrace.cs(20,74): error CS0535: 'AnrStackTrace' does not implement interface member 'IComparable.CompareTo(Object)'
---
 src/Sentry.Bindings.Android/Transforms/Metadata.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Sentry.Bindings.Android/Transforms/Metadata.xml b/src/Sentry.Bindings.Android/Transforms/Metadata.xml
index c7a669f839..bc23ddbc6c 100644
--- a/src/Sentry.Bindings.Android/Transforms/Metadata.xml
+++ b/src/Sentry.Bindings.Android/Transforms/Metadata.xml
@@ -86,6 +86,13 @@
     </method>
   </add-node>
 
+  <!-- Fix missing compareTo(Object) method for AnrStackTrace -->
+  <add-node path="/api/package[@name='io.sentry.android.core.anr']/class[@name='AnrStackTrace']">
+    <method name="compareTo" return="int" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public">
+        <parameter name="p0" type="java.lang.Object" />
+    </method>
+  </add-node>
+
   <!-- Remove problematic deprecated methods in the IScopes interface -->
   <remove-node path="/api/package[@name='io.sentry']/interface[@name='IScopes']/method[@deprecated]" />