chore(deps): update Java SDK (Android) to v8.2.0 (#783)

* chore: update modules/sentry-java to 8.2.0

* Download pre-built Native SDK NDK

* Fix missing ndk cache dir

* Update snapshot

* Update build script

* Update Android UPL

---------

Co-authored-by: GitHub <[email protected]>
Co-authored-by: Ivan Tustanivskyi <[email protected]>

Author: 3 people

.craft.yml

@@ -2,10 +2,6 @@ minVersion: 0.24.0
 changelogPolicy: auto
 preReleaseCommand: pwsh scripts/bump-version.ps1
 targets:
-  - name: symbol-collector
-    includeNames: /libsentry(-android)?\.so/
-    batchType: android
-    bundleIdPrefix: sentry-unreal-android-ndk-
   - name: github
     includeNames: /^sentry-unreal-.*.zip$/i
   - name: registry

.github/workflows/ci.yml

@@ -73,11 +73,6 @@ jobs:
           name: Android-sdk
           path: plugin-dev/Source/ThirdParty/Android
 
-      - uses: actions/download-artifact@v4
-        with:
-          name: Android-libraries
-          path: modules/sentry-java/sentry-android-ndk/build/intermediates/merged_native_libs/release/out/lib
-
       - uses: actions/download-artifact@v4
         with:
           name: IOS-sdk

.github/workflows/sdk-build.yml

@@ -87,10 +87,3 @@ jobs:
           name: ${{ inputs.target }}-sdk
           path: ${{ steps.env.outputs.path }}
           retention-days: ${{ github.ref_name == 'main' && 14 || 1 }}
-
-      - uses: actions/upload-artifact@v4
-        if: ${{ inputs.target == 'Android' }}
-        with:
-          name: ${{ inputs.target }}-libraries
-          path: modules/sentry-java/sentry-android-ndk/build/intermediates/merged_native_libs/release/out/lib/*
-          retention-days: 1

CHANGELOG.md

@@ -31,6 +31,9 @@
 - Bump Native SDK from v0.7.17 to v0.7.20 ([#737](https://github.com/getsentry/sentry-unreal/pull/737), [#742](https://github.com/getsentry/sentry-unreal/pull/742), [#764](https://github.com/getsentry/sentry-unreal/pull/764))
   - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0720)
   - [diff](https://github.com/getsentry/sentry-native/compare/0.7.17...0.7.20)
+- Bump Java SDK (Android) from v8.2.0-1-g9180dc53 to v8.2.0 ([#783](https://github.com/getsentry/sentry-unreal/pull/783))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#820)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.2.0-1-g9180dc53...8.2.0)
 
 ## 0.22.0
 

modules/sentry-java

@@ -46,6 +46,7 @@
         <copyFile src="$S(PluginDir)/../ThirdParty/Android/sentry.jar" dst="$S(BuildDir)/gradle/app/libs/sentry.jar" />
         <copyFile src="$S(PluginDir)/../ThirdParty/Android/sentry-android-core-release.aar" dst="$S(BuildDir)/gradle/app/libs/sentry-android-core-release.aar" />
         <copyFile src="$S(PluginDir)/../ThirdParty/Android/sentry-android-ndk-release.aar" dst="$S(BuildDir)/gradle/app/libs/sentry-android-ndk-release.aar" />
+        <copyFile src="$S(PluginDir)/../ThirdParty/Android/sentry-native-ndk-release.aar" dst="$S(BuildDir)/gradle/app/libs/sentry-native-ndk-release.aar" />
         <if condition="bUploadSymbols">
             <true>
                 <copyFile src="$S(ProjectDir)/sentry.properties" dst="$S(BuildDir)/gradle/sentry.properties" />

plugin-dev/Source/Sentry/Sentry_Android_UPL.xml

@@ -16,3 +16,32 @@ cp "${sentryJavaRoot}/sentry-android-ndk/build/outputs/aar/sentry-android-ndk-re
 cp "${sentryJavaRoot}/sentry-android-core/build/outputs/aar/sentry-android-core-release.aar" "${sentryArtifactsDestination}/sentry-android-core-release.aar"
 
 cp "${sentryJavaRoot}/sentry/build/libs/"sentry-*.jar "${sentryArtifactsDestination}/sentry.jar"
+
+# With version v8 of the sentry-java the Native SDK NDK has to be downloaded separately from the sentry-native repo release page
+
+configFile="${sentryJavaRoot}/buildSrc/src/main/java/Config.kt"
+if [[ ! -f "$configFile" ]]; then
+  echo "Error: Config.kt file not found at $configFile"
+  exit 1
+fi
+
+nativeNdkVersion=$(grep 'sentryNativeNdk' "$configFile" | sed -E 's/.*sentryNativeNdk\s*=\s*"[^"]+:([^"]+)".*/\1/')
+if [[ -z "$nativeNdkVersion" ]]; then
+  echo "Error: Failed to extract Native SDK NDK version."
+  exit 1
+fi
+
+echo "Extracted Sentry Native NDK version: $nativeNdkVersion"
+
+nativeNdkCache="${sentryJavaRoot}/native-ndk-cache"
+if ! [ -d "$nativeNdkCache" ]; then
+    mkdir "$nativeNdkCache"
+fi
+
+nativeNdkUrl="https://github.com/getsentry/sentry-native/releases/download/${nativeNdkVersion}/sentry-native-ndk-${nativeNdkVersion}.zip"
+
+curl -L "${nativeNdkUrl}" -o "${nativeNdkCache}/sentry-native-ndk-${nativeNdkVersion}.zip"
+
+unzip -o "${nativeNdkCache}/sentry-native-ndk-${nativeNdkVersion}.zip" -d "${nativeNdkCache}/"
+
+cp "${nativeNdkCache}/sentry-native-ndk-${nativeNdkVersion}/sentry-native-ndk-release.aar" "${sentryArtifactsDestination}/sentry-native-ndk-release.aar"