From beaca75bc8a9c7dd59be501b2cd467ab8989e3f6 Mon Sep 17 00:00:00 2001
From: Antonis Lilis <antonis.lilis@sentry.io>
Date: Thu, 22 Oct 2026 13:06:23 +0200
Subject: [PATCH] fix(android): Revert Android SDK bump to 8.61.1

Reverts #6929. sentry-java 8.61.1 is compiled with JDK 21, whose javac
emits nameless MethodParameters entries that crash D8 from AGP <= 8.0
(RN <= 0.72) while dexing, failing the RN 0.71 E2E build on main.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 CHANGELOG.md                                  |   3 ---
 packages/core/android/build.gradle            |   2 +-
 .../core/android/expo-handler/build.gradle    |   2 +-
 packages/core/android/libs/replay-stubs.jar   | Bin 1198 -> 1198 bytes
 .../core/android/replay-stubs/build.gradle    |   2 +-
 packages/core/sentry.gradle.kts               |   2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39a32b7603..ebb7c1fbc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,9 +40,6 @@
 - Bump CLI from v3.8.0 to v3.8.1 ([#6924](https://github.com/getsentry/sentry-react-native/pull/6924))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#381)
   - [diff](https://github.com/getsentry/sentry-cli/compare/3.8.0...3.8.1)
-- Bump Android SDK from v8.61.0 to v8.61.1 ([#6929](https://github.com/getsentry/sentry-react-native/pull/6929))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8611)
-  - [diff](https://github.com/getsentry/sentry-java/compare/8.61.0...8.61.1)
 
 ## 8.31.0
 
diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
index 540f1c120b..0c02f9959a 100644
--- a/packages/core/android/build.gradle
+++ b/packages/core/android/build.gradle
@@ -185,7 +185,7 @@ android {
     }
 }
 
-def sentryAndroidVersion = '8.61.1'
+def sentryAndroidVersion = '8.61.0'
 
 dependencies {
     compileOnly files('libs/replay-stubs.jar')
diff --git a/packages/core/android/expo-handler/build.gradle b/packages/core/android/expo-handler/build.gradle
index 759af06ea6..4874c93cac 100644
--- a/packages/core/android/expo-handler/build.gradle
+++ b/packages/core/android/expo-handler/build.gradle
@@ -20,5 +20,5 @@ android {
 
 dependencies {
     compileOnly project(':expo-modules-core')
-    compileOnly 'io.sentry:sentry-android:8.61.1'
+    compileOnly 'io.sentry:sentry-android:8.61.0'
 }
diff --git a/packages/core/android/libs/replay-stubs.jar b/packages/core/android/libs/replay-stubs.jar
index 926f3f9d21963feab2ba02274cb466bb5f68b56b..2fa4163bf12688b5ac080edfa9f42ba610161a4d 100644
GIT binary patch
delta 150
zcmZ3-xsH=Jz?+#xgn@yBgW;ou|3qFjW)NlOr3R#88GwKZL;wLZ5NGD=Gc%xSSf&ov
za6unLO=e;=1JRqU87DJ>1uim~fN2h9dob<AtOus6nN7j;W@cM3{h8SXOk1&(002mi
BC;$Ke

delta 150
zcmZ3-xsH=Jz?+#xgn@yBgQ3$mY$C53Gl(+tQUg-43_!pHB7lGyh%@u`nHf+uEK>(-
zxS$WBCNnXbf#}WFjFTC`0vDM~z%&Q5J(%`l)&tYk%%)&^GqWw2{><zGrma{?0IAI-
Am;e9(

diff --git a/packages/core/android/replay-stubs/build.gradle b/packages/core/android/replay-stubs/build.gradle
index b223efd879..635738dae4 100644
--- a/packages/core/android/replay-stubs/build.gradle
+++ b/packages/core/android/replay-stubs/build.gradle
@@ -18,5 +18,5 @@ tasks.named('jar', Jar) {
 }
 
 dependencies {
-  compileOnly 'io.sentry:sentry:8.61.1'
+  compileOnly 'io.sentry:sentry:8.61.0'
 }
diff --git a/packages/core/sentry.gradle.kts b/packages/core/sentry.gradle.kts
index 7599682fbc..2db85264ac 100644
--- a/packages/core/sentry.gradle.kts
+++ b/packages/core/sentry.gradle.kts
@@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 import java.util.regex.Pattern
 import javax.inject.Inject
 
-val expectedSentryAndroidVersion = "8.61.1"
+val expectedSentryAndroidVersion = "8.61.0"
 
 val sentryVersionCheckWarned = AtomicBoolean(false)
 project.configurations.configureEach {