diff --git a/.github/workflows/sdk.yml b/.github/workflows/sdk.yml index a7660b02f..90f094d76 100644 --- a/.github/workflows/sdk.yml +++ b/.github/workflows/sdk.yml @@ -89,13 +89,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/CHANGELOG.md b/CHANGELOG.md index 1e86b784b..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) 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... diff --git a/modules/sentry-java b/modules/sentry-java index 9998c9875..0f55e39da 160000 --- a/modules/sentry-java +++ b/modules/sentry-java @@ -1 +1 @@ -Subproject commit 9998c9875efe14b90f11e0e349f70563728d1d39 +Subproject commit 0f55e39daaba7f1fd155aeb79b0c87b58c38939e