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.

Sign up for GitHub

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

Bump to dotnet/java-interop/main@2c06b3c2 #9633

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Bump to dotnet/java-interop/main@2c06b3c2 #9633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated 14 files
+55 −0 build-tools/trim-analyzers/trim-analyzers.props
+1 −3 src/Java.Interop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings.csproj
+1 −3 src/Java.Interop/Java.Interop.csproj
+1 −1 src/Java.Interop/Java.Interop/JavaArray.cs
+0 −1 src/Java.Interop/Java.Interop/JavaObject.cs
+3 −3 src/Java.Interop/Java.Interop/JavaObjectArray.cs
+16 −16 src/Java.Interop/Java.Interop/JavaPrimitiveArrays.cs
+24 −24 src/Java.Interop/Java.Interop/JniBuiltinMarshalers.cs
+3 −9 src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
+2 −2 src/Java.Interop/Java.Interop/JniRuntime.JniTypeManager.cs
+30 −41 src/Java.Interop/Java.Interop/JniRuntime.JniValueManager.cs
+1 −1 src/Java.Interop/Java.Interop/JniStringValueMarshaler.cs
+6 −6 src/Java.Interop/Java.Interop/JniValueMarshaler.cs
+3 −3 src/Java.Interop/Java.Interop/JniValueMarshalerAttribute.cs
4 changes: 2 additions & 2 deletions src/Mono.Android/Android.Graphics/Color.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ public static void RGBToHSV (int red, int green, int blue, float[] hsv)

public class ColorValueMarshaler : JniValueMarshaler<Color>
{
const DynamicallyAccessedMemberTypes ConstructorsAndInterfaces = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.Interfaces;
const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
const string ExpressionRequiresUnreferencedCode = "System.Linq.Expression usage may trim away required code.";

public override Type MarshalType {
Expand All @@ -405,7 +405,7 @@ public override Type MarshalType {
public override Color CreateGenericValue (
ref JniObjectReference reference,
JniObjectReferenceOptions options,
[DynamicallyAccessedMembers (ConstructorsAndInterfaces)]
[DynamicallyAccessedMembers (Constructors)]
Type targetType)
{
throw new NotImplementedException ();
Expand Down
4 changes: 2 additions & 2 deletions src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ namespace Android.Runtime
{
sealed class IJavaObjectValueMarshaler : JniValueMarshaler<IJavaObject> {

const DynamicallyAccessedMemberTypes ConstructorsAndInterfaces = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.Interfaces;
const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
const string ExpressionRequiresUnreferencedCode = "System.Linq.Expression usage may trim away required code.";

internal static IJavaObjectValueMarshaler Instance = new IJavaObjectValueMarshaler ();

public override IJavaObject CreateGenericValue (
ref JniObjectReference reference,
JniObjectReferenceOptions options,
[DynamicallyAccessedMembers (ConstructorsAndInterfaces)]
[DynamicallyAccessedMembers (Constructors)]
Type? targetType)
{
throw new NotImplementedException ();
Expand Down
1 change: 1 addition & 0 deletions tests/api-compatibility/acceptable-breakages-vReference-net9.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Compat issues with assembly Mono.Android:
CannotChangeAttribute : Attribute 'System.Diagnostics.CodeAnalysis.DynamicallyAccessedMembersAttribute' on parameter 'targetType' on member 'Android.Graphics.ColorValueMarshaler.CreateGenericValue(Java.Interop.JniObjectReference, Java.Interop.JniObjectReferenceOptions, System.Type)' changed from '[DynamicallyAccessedMembersAttribute(8199)]' in the contract to '[DynamicallyAccessedMembersAttribute(7)]' in the implementation.
Loading