Skip to content
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(LatestAndroidTfm);$(PreviousAndroidTfm)</TargetFrameworks>
<SentryAndroidSdkVersion>8.29.0</SentryAndroidSdkVersion>
<SentryAndroidSdkVersion>8.32.0</SentryAndroidSdkVersion>
<SentryAndroidSdkDirectory>$(BaseIntermediateOutputPath)sdks\$(TargetFramework)\Sentry\Android\$(SentryAndroidSdkVersion)\</SentryAndroidSdkDirectory>
<!-- This gets resolved by the DownloadSentryAndroidSdk unless using local maven references -->
<SentryNativeNdkVersion></SentryNativeNdkVersion>
Expand Down Expand Up @@ -121,6 +121,12 @@
JavaArtifact="io.sentry:sentry-native-ndk:$(SentryNativeNdkVersion)" />
</ItemGroup>

<!-- protobuf-javalite 3.25.8 has no matching/compatible Xamarin.Protobuf.JavaLite NuGet package
(see https://github.com/getsentry/sentry-java/pull/5044) -->
<ItemGroup>
<AndroidMavenLibrary Include="com.google.protobuf:protobuf-javalite" Version="3.25.8" Bind="false" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably add mention of this in the changelog (the fact that we're adding a new dependency when targeting net10.0-android).

I think a changelog would get generated automatically for this PR now that we've moved to automated changelogs. However, OOTB it would use the title of the PR, which doesn't make any mention of this new dependency.

Apparently it's possible to customise the changelog for a PR though:

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice :) I've added changelog entries to the PR description

</ItemGroup>

<ItemGroup>
<AndroidLibrary Include="..\..\lib\sentry-android-supplemental\bin\sentry-android-supplemental.jar" />
<AndroidNativeLibrary Include="..\..\lib\sentrysupplemental\bin\arm64-v8a\libsentrysupplemental.so" Abi="arm64-v8a" />
Expand Down
4 changes: 1 addition & 3 deletions src/Sentry.Bindings.Android/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,9 @@
<!--
The BackfillingEventProcessor interface creates a stack overflow during code generation, which appears as:
error MSB6006: "dotnet" exited with code 134
AnrV2EventProcessor is dependant on BackfillingEventProcessor
We currently don't need to use either of these via C# bindings.
We currently don't need to use this via C# bindings.
-->
<remove-node path="/api/package[@name='io.sentry']/interface[@name='BackfillingEventProcessor']" />
<remove-node path="/api/package[@name='io.sentry.android.core']/class[@name='AnrV2EventProcessor']" />

<!--
SentryEvent.serialize() expects an parameter which implements IObjectWriter.
Expand Down
Loading