diff --git a/CHANGELOG.md b/CHANGELOG.md index aa5aa91436..f60403293d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ - Move tunnel functionality into Sentry.AspNetCore ([#1645](https://github.com/getsentry/sentry-dotnet/pull/1645)) - Make `HttpContext` available for sampling decisions ([#1682](https://github.com/getsentry/sentry-dotnet/pull/1682)) - Initial support for .NET MAUI ([#1663](https://github.com/getsentry/sentry-dotnet/pull/1663)) ([#1670](https://github.com/getsentry/sentry-dotnet/pull/1670)) -- Initial support for `net6.0-android` apps ([#1288](https://github.com/getsentry/sentry-dotnet/pull/1288)) ([#1669](https://github.com/getsentry/sentry-dotnet/pull/1669)) +- Initial support for `net6.0-android` apps ([#1288](https://github.com/getsentry/sentry-dotnet/pull/1288)) ([#1669](https://github.com/getsentry/sentry-dotnet/pull/1669)) ([#1686](https://github.com/getsentry/sentry-dotnet/pull/1686)) ### Fixes diff --git a/libs/Android/sentry-5.7.4.jar b/libs/Android/sentry-5.7.4.jar deleted file mode 100644 index a2b876ceeb..0000000000 Binary files a/libs/Android/sentry-5.7.4.jar and /dev/null differ diff --git a/libs/Android/sentry-6.0.0-rc.1.jar b/libs/Android/sentry-6.0.0-rc.1.jar new file mode 100644 index 0000000000..852b90e513 Binary files /dev/null and b/libs/Android/sentry-6.0.0-rc.1.jar differ diff --git a/libs/Android/sentry-android-core-5.7.4.aar b/libs/Android/sentry-android-core-5.7.4.aar deleted file mode 100644 index 894d0ef136..0000000000 Binary files a/libs/Android/sentry-android-core-5.7.4.aar and /dev/null differ diff --git a/libs/Android/sentry-android-core-6.0.0-rc.1.aar b/libs/Android/sentry-android-core-6.0.0-rc.1.aar new file mode 100644 index 0000000000..576207afc4 Binary files /dev/null and b/libs/Android/sentry-android-core-6.0.0-rc.1.aar differ diff --git a/libs/Android/sentry-android-ndk-5.7.4.aar b/libs/Android/sentry-android-ndk-5.7.4.aar deleted file mode 100644 index 0ada3bd806..0000000000 Binary files a/libs/Android/sentry-android-ndk-5.7.4.aar and /dev/null differ diff --git a/libs/Android/sentry-android-ndk-6.0.0-rc.1.aar b/libs/Android/sentry-android-ndk-6.0.0-rc.1.aar new file mode 100644 index 0000000000..63773d1a2a Binary files /dev/null and b/libs/Android/sentry-android-ndk-6.0.0-rc.1.aar differ diff --git a/src/Sentry/Android/Sentry.Android.props b/src/Sentry/Android/Sentry.Android.props index 0b3dd1c4ad..ff3484a194 100644 --- a/src/Sentry/Android/Sentry.Android.props +++ b/src/Sentry/Android/Sentry.Android.props @@ -1,18 +1,14 @@ 21 - - - $(NoWarn);BG8604;BG8605;BG8606 - 5.7.4 + $(NoWarn);BG8605;BG8606 + 6.0.0-rc.1 $(MSBuildProjectDirectory)/../../libs/Android/ - - diff --git a/src/Sentry/Android/Transforms/Metadata.xml b/src/Sentry/Android/Transforms/Metadata.xml index 3bc91f21cf..9c6bc0662a 100644 --- a/src/Sentry/Android/Transforms/Metadata.xml +++ b/src/Sentry/Android/Transforms/Metadata.xml @@ -1,50 +1,68 @@ + + + internal internal + Sentry.Java + Sentry.Android + Sentry.Android.Internal.Gestures + Sentry.Android.Internal.Util + Sentry.Android.Ndk Sentry.Java.Cache - Sentry.Java.Transport + Sentry.Java.ClientReport Sentry.Java.Configuration + Sentry.Java.Exception Sentry.Java.Hints - Sentry.Java.Util + Sentry.Java.Instrumentation.File + Sentry.Java.Transport Sentry.Java.Protocol + Sentry.Java.Util Sentry.Java.Vendor - Sentry.Java.Exception - Sentry.Android - Sentry.Android.Ndk + Sentry.Java.Vendor.Gson.Stream + Sentry.Java.Vendor.Gson.Internal.Bind.Util - - - - - - - - - - - - - - - - + + ThrowableValue + DescriptionValue + StatusValue + TagsValue + + + SentryTraceHeaderName + TraceStateHeaderName + - + + + - - - + + + > + - - GetTags - GetStatus - GetDescription - GetThrowable + +