Bump to dotnet/java-interop@2c06b3c2

Changes: dotnet/java-interop@f800ea5...2c06b3c * dotnet/java-interop@2c06b3c2: [Java.Interop] remove `DynamicallyAccessedMemberTypes.Interfaces` (dotnet/java-interop#1285)
dotnet · Dec 19, 2024 · bf36434 · bf36434
1 parent 8d77130
commit bf36434
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/external/Java.Interop b/external/Java.Interop
diff --git a/src/Mono.Android/Android.Graphics/Color.cs b/src/Mono.Android/Android.Graphics/Color.cs
@@ -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 {
@@ -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 ();

diff --git a/src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs b/src/Mono.Android/Android.Runtime/IJavaObjectValueMarshaler.cs
@@ -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 ();
+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