From 06e2af0b536ff40b7c394ecd0c2e7fe3aa551894 Mon Sep 17 00:00:00 2001
From: GitHub <noreply@github.com>
Date: Wed, 10 Sep 2025 03:08:35 +0000
Subject: [PATCH 1/2] chore: update scripts/update-java.ps1 to 8.21.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ab5882212..832828628e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,9 +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.21.0 ([#4496](https://github.com/getsentry/sentry-dotnet/pull/4496), [#4502](https://github.com/getsentry/sentry-dotnet/pull/4502))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8210)
-  - [diff](https://github.com/getsentry/sentry-java/compare/8.6.0...8.21.0)
+- Bump Java SDK from v8.6.0 to v8.21.1 ([#4496](https://github.com/getsentry/sentry-dotnet/pull/4496), [#4502](https://github.com/getsentry/sentry-dotnet/pull/4502), [#4508](https://github.com/getsentry/sentry-dotnet/pull/4508))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8211)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.6.0...8.21.1)
 
 ## 5.14.1
 
diff --git a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
index 5bf93c1c6d..5dc66abed6 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.21.0</SentryAndroidSdkVersion>
+    <SentryAndroidSdkVersion>8.21.1</SentryAndroidSdkVersion>
     <SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\$(TargetFramework)\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
     <!-- This gets resolved by the DownloadSentryAndroidSdk target -->
     <SentryNativeNdkVersion></SentryNativeNdkVersion>

From ee3efe5238acc6322ae0c8306e1f738e3cb4ed7e Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Wed, 10 Sep 2025 07:58:48 +0200
Subject: [PATCH 2/2] Revert "Bump Xamarin.Kotlin.StdLib.Jdk8"

---
 .../Sentry.Bindings.Android.csproj                        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
index 5dc66abed6..0180326bd2 100644
--- a/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
+++ b/src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj
@@ -51,8 +51,8 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.Common.Java8" Version="2.6.1.3" />
     <!-- MAUI 8 references this version indirectly via Xamarin.AndroidX.SwipeRefreshLayout (>= 1.1.0.14)   -->
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.2" />
-    <!-- We need 1.9.24 but there's no NuGet package for that version... the lowest version we can use is 2.2.0 -->
-    <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.2.0" />
+    <!-- We need 1.9.24 but there's no NuGet package for that version... the lowest version we can use is 2.0.0 -->
+    <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.0.0" />
   </ItemGroup>
 
   <!-- Dependencies for AndroidMavenLibrary references
@@ -63,8 +63,8 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.Common.Java8" Version="2.8.7.2" />
     <!-- MAUI 9 references this version indirectly via Xamarin.AndroidX.SwipeRefreshLayout   -->
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.15.0.2" />
-    <!-- We need 1.9.24 but there's no NuGet package for that version... the lowest version we can use is 2.2.0 -->
-    <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.2.0" />
+    <!-- We need 1.9.24 but there's no NuGet package for that version... the lowest version we can use is 2.0.0 -->
+    <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">