Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update Java SDK to v6.15.0 #2207

Merged
merged 4 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@

### Dependencies

- Bump Java SDK from v6.13.1 to v6.15.0 ([#2185](https://github.com/getsentry/sentry-dotnet/pull/2185), [#2207](https://github.com/getsentry/sentry-dotnet/pull/2207))
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6150)
- [diff](https://github.com/getsentry/sentry-java/compare/6.13.1...6.15.0)
- Bump CLI from v2.12.0 to v2.13.0 ([#2187](https://github.com/getsentry/sentry-dotnet/pull/2187))
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2130)
- [diff](https://github.com/getsentry/sentry-cli/compare/2.12.0...2.13.0)
- Bump Java SDK from v6.13.1 to v6.14.0 ([#2185](https://github.com/getsentry/sentry-dotnet/pull/2185))
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6140)
- [diff](https://github.com/getsentry/sentry-java/compare/6.13.1...6.14.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net6.0-android</TargetFramework>
<!-- BG8605 and BG8606 happen because there's a missing androidx.lifecycle dependency, but we don't need it here. (The native Android Sentry SDK will use it if it exists.) -->
<NoWarn>$(NoWarn);BG8605;BG8606</NoWarn>
<SentryAndroidSdkVersion>6.14.0</SentryAndroidSdkVersion>
<SentryAndroidSdkVersion>6.15.0</SentryAndroidSdkVersion>
<SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
<Description>.NET Bindings for the Sentry Android SDK</Description>
</PropertyGroup>
Expand Down
13 changes: 12 additions & 1 deletion src/Sentry.Bindings.Android/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<attr path="/api/package[@name='io.sentry']" name="managedName">Sentry.JavaSdk</attr>
<attr path="/api/package[@name='io.sentry.android.core']" name="managedName">Sentry.JavaSdk.Android.Core</attr>
<attr path="/api/package[@name='io.sentry.android.core.internal.gestures']" name="managedName">Sentry.JavaSdk.Android.Core.Internal.Gestures</attr>
<attr path="/api/package[@name='io.sentry.android.core.internal.modules']" name="managedName">Sentry.JavaSdk.Android.Core.Internal.Modules</attr>
<attr path="/api/package[@name='io.sentry.android.core.internal.util']" name="managedName">Sentry.JavaSdk.Android.Core.Internal.Util</attr>
<attr path="/api/package[@name='io.sentry.android.ndk']" name="managedName">Sentry.JavaSdk.Android.Ndk</attr>
<attr path="/api/package[@name='io.sentry.android.supplemental']" name="managedName">Sentry.JavaSdk.Android.Supplemental</attr>
Expand All @@ -29,12 +30,16 @@
<attr path="/api/package[@name='io.sentry.exception']" name="managedName">Sentry.JavaSdk.Exception</attr>
<attr path="/api/package[@name='io.sentry.hints']" name="managedName">Sentry.JavaSdk.Hints</attr>
<attr path="/api/package[@name='io.sentry.instrumentation.file']" name="managedName">Sentry.JavaSdk.Instrumentation.File</attr>
<attr path="/api/package[@name='io.sentry.internal.gestures']" name="managedName">Sentry.JavaSdk.Internal.Gestures</attr>
<attr path="/api/package[@name='io.sentry.internal.modules']" name="managedName">Sentry.JavaSdk.Internal.Modules</attr>
<attr path="/api/package[@name='io.sentry.transport']" name="managedName">Sentry.JavaSdk.Transport</attr>
<attr path="/api/package[@name='io.sentry.profilemeasurements']" name="managedName">Sentry.JavaSdk.ProfileMeasurements</attr>
<attr path="/api/package[@name='io.sentry.protocol']" name="managedName">Sentry.JavaSdk.Protocol</attr>
<attr path="/api/package[@name='io.sentry.util']" name="managedName">Sentry.JavaSdk.Util</attr>
<attr path="/api/package[@name='io.sentry.util.thread']" name="managedName">Sentry.JavaSdk.Util.Thread</attr>
<attr path="/api/package[@name='io.sentry.vendor']" name="managedName">Sentry.JavaSdk.Vendor</attr>
<attr path="/api/package[@name='io.sentry.vendor.gson.stream']" name="managedName">Sentry.JavaSdk.Vendor.Gson.Stream</attr>
<attr path="/api/package[@name='io.sentry.vendor.gson.internal.bind.util']" name="managedName">Sentry.JavaSdk.Vendor.Gson.Internal.Bind.Util</attr>
<attr path="/api/package[@name='io.sentry.vendor.gson.stream']" name="managedName">Sentry.JavaSdk.Vendor.Gson.Stream</attr>

<!--
These properties have conflicts that create BG8401 warnings ("Skipping '...' due to a duplicate field or property name.")
Expand Down Expand Up @@ -67,6 +72,12 @@
-->
<remove-node path="/api/package[@name='io.sentry.android.core.internal.util']/*[starts-with(@name,'SentryFrameMetricsCollector')]" />

<!--
This is very strange, but this API causes the dotnet process to crash during the BindingsGenerator task when the interface containing it is marked internal.
Either removing this method or switching the interface back to public fixes the issue. Since we don't need it in .NET, we can remove the method.
-->
<remove-node path="/api/package[@name='io.sentry']/interface[@name='IntegrationName']/method[@name='addIntegrationToSdkVersion']" />

<!--
The remaining APIS are removed to prevent various errors/warnings.
TODO: Find other workarounds for each one, rather than removing the APIs.
Expand Down