Merge 0135d6a into 08b072d

getsentry · Mar 13, 2023 · cad8877 · cad8877
2 parents 08b072d + 0135d6a
commit cad8877
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,9 @@
 ### Dependencies
 
 - Bump `opentelemetry-sdk` to `1.23.1` and `opentelemetry-javaagent` to `1.23.0` ([#2590](https://github.com/getsentry/sentry-java/pull/2590))
+- Bump Native SDK from v0.5.4 to v0.6.0 ([#2545](https://github.com/getsentry/sentry-java/pull/2545))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#060)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.5.4...0.6.0)
 
 ## 6.15.0
 

diff --git a/sentry-android-ndk/sentry-native b/sentry-android-ndk/sentry-native
+14 −0		.github/workflows/ci.yml
+31 −0		CHANGELOG.md
+13 −10		CMakeLists.txt
+6 −0		external/CMakeLists.txt
+1 −1		external/breakpad
+1 −1		external/crashpad
+1 −1		external/libunwindstack-ndk
+31 −16		include/sentry.h
+54 −0		scripts/install-llvm-mingw.ps1
+1 −1		src/backends/sentry_backend_crashpad.cpp
+4 −0		src/exports.map
+2 −2		src/sentry_core.c
+3 −3		src/sentry_info.c
+2 −2		src/sentry_scope.c
+2 −2		src/sentry_scope.h
+22 −4		src/sentry_session.c
+0 −7		src/sentry_session.h
+1 −1		src/sentry_sync.c
+1 −1		src/sentry_sync.h
+1 −1		src/sentry_utils.c
+18 −2		src/unwinder/sentry_unwinder_dbghelp.c
+2 −2		tests/assertions.py
+1 −1		tests/cmake.py
+1 −1		tests/test_integration_http.py
+1 −0		tests/unit/CMakeLists.txt
+5 −2		tests/unit/test_session.c