From 7fee0677f16933583627ca834fb0848744afdcd0 Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 23 Oct 2026 03:02:35 +0000 Subject: [PATCH 1/4] chore: update modules/sentry-java to 8.61.1 --- CHANGELOG.md | 8 ++++++++ modules/sentry-java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee836469d..62acc5cb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## Unreleased + +### Dependencies + +- Bump Java SDK from v8.61.0 to v8.61.1 ([#2897](https://github.com/getsentry/sentry-unity/pull/2897)) + - [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) + ## 4.11.0 ### Fixes diff --git a/modules/sentry-java b/modules/sentry-java index 9998c9875..e220ec4c2 160000 --- a/modules/sentry-java +++ b/modules/sentry-java @@ -1 +1 @@ -Subproject commit 9998c9875efe14b90f11e0e349f70563728d1d39 +Subproject commit e220ec4c20de6eec960a343cdabc955b99152b7b From cd361928cab35dc7ae1bc9860f84da69e22644c3 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Tue, 27 Oct 2026 15:35:45 +0100 Subject: [PATCH 2/4] Pin Java 21 for the Android SDK build --- .github/workflows/sdk.yml | 4 ++-- CONTRIBUTING.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml index 27adc7e62..8cbcee275 100644 --- a/.github/workflows/sdk.yml +++ b/.github/workflows/sdk.yml @@ -87,13 +87,13 @@ jobs: if: ${{ steps.cache.outputs.cache-hit != 'true' }} run: dotnet workload restore - # javac 25 (default on ubuntu-26.04) warns on generated sources and sentry-native's ndk builds with -Werror. + # sentry-java requires JDK 21+; javac 25 (default on ubuntu-26.04) warns on generated sources and sentry-native's ndk builds with -Werror. - name: Setup Java if: ${{ env.TARGET == 'Android' && steps.cache.outputs.cache-hit != 'true' }} uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: '17' + java-version: '21' - name: Build if: steps.cache.outputs.cache-hit != 'true' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ebe55db4..cb5b8183a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,7 +64,7 @@ Required tools: Required tools: - Git (accessible from `PATH`) - [Android Studio](https://developer.android.com/studio) -- JDK 17 (via [sdkman](https://sdkman.io/) or [OpenJDK](https://openjdk.java.net/install/)) +- JDK 21 (via [sdkman](https://sdkman.io/) or [OpenJDK](https://openjdk.java.net/install/)) **Android Studio Setup:** 1. Open Android Studio → Customize → All settings... From f98b7a5d1782b04271deb40690d224376d747cd2 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 28 Oct 2026 10:48:01 +0100 Subject: [PATCH 3/4] Bump Java SDK to 8.62.0 --- CHANGELOG.md | 6 +++--- modules/sentry-java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0278b713..c01423db9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ ### Dependencies -- Bump Java SDK from v8.61.0 to v8.61.1 ([#2897](https://github.com/getsentry/sentry-unity/pull/2897)) - - [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) +- Bump Java SDK from v8.61.0 to v8.62.0 ([#2897](https://github.com/getsentry/sentry-unity/pull/2897)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8620) + - [diff](https://github.com/getsentry/sentry-java/compare/8.61.0...8.62.0) - Bump CLI from v3.8.0 to v3.8.2 ([#2893](https://github.com/getsentry/sentry-unity/pull/2893)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#382) - [diff](https://github.com/getsentry/sentry-cli/compare/3.8.0...3.8.2) diff --git a/modules/sentry-java b/modules/sentry-java index e220ec4c2..0f55e39da 160000 --- a/modules/sentry-java +++ b/modules/sentry-java @@ -1 +1 @@ -Subproject commit e220ec4c20de6eec960a343cdabc955b99152b7b +Subproject commit 0f55e39daaba7f1fd155aeb79b0c87b58c38939e From a81a342afbe26a234ff7aebe65d43132a5d50902 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 11 Nov 2026 11:10:29 +0100 Subject: [PATCH 4/4] Move the Java SDK changelog entry to Unreleased --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b37249aa7..c8d8b12f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ ### Dependencies +- Bump Java SDK from v8.61.0 to v8.62.0 ([#2897](https://github.com/getsentry/sentry-unity/pull/2897)) + - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8620) + - [diff](https://github.com/getsentry/sentry-java/compare/8.61.0...8.62.0) - Bump Native SDK from v0.17.5 to v0.17.6 ([#2935](https://github.com/getsentry/sentry-unity/pull/2935)) - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0176) - [diff](https://github.com/getsentry/sentry-native/compare/0.17.5...0.17.6) @@ -37,9 +40,6 @@ ### Dependencies -- Bump Java SDK from v8.61.0 to v8.62.0 ([#2897](https://github.com/getsentry/sentry-unity/pull/2897)) - - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8620) - - [diff](https://github.com/getsentry/sentry-java/compare/8.61.0...8.62.0) - Bump CLI from v3.8.0 to v3.8.2 ([#2893](https://github.com/getsentry/sentry-unity/pull/2893)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#382) - [diff](https://github.com/getsentry/sentry-cli/compare/3.8.0...3.8.2)