Skip to content

Bump external/Java.Interop from b881d21 to cfca8ad #11622

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

Open
dependabot wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Bump external/Java.Interop from b881d21 to cfca8ad #11622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f93939c
Bump external/Java.Interop from `b881d21` to `d7dbad5`
dependabot[bot] Jun 10, 2026
6a34c90
Change base type of value managers and type managers
simonrozsival Jun 12, 2026
190ec93
Bump external/Java.Interop from d7dbad5 to cfca8ad
jonathanpeppers Jun 12, 2026
6dbddba
Update BuildReleaseArm64SimpleDotNet.MonoVM.apkdesc for Java.Interop …
jonathanpeppers Jun 12, 2026
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 143 files
8 changes: 6 additions & 2 deletions src/Mono.Android/Android.Runtime/AndroidRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ public override void DeleteWeakGlobalReference (ref JniObjectReference value)
}
}

class AndroidTypeManager : JniRuntime.JniTypeManager {
[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This suppression will be addressed in a follow-up PR.")]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This suppression will be addressed in a follow-up PR.")]
class AndroidTypeManager : JniRuntime.ReflectionJniTypeManager {
bool jniAddNativeMethodRegistrationAttributePresent;

const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
Expand Down Expand Up @@ -623,7 +625,9 @@ static void SplitMethodLine (
}
}

class AndroidValueManager : JniRuntime.JniValueManager {
[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This suppression will be addressed in a follow-up PR.")]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This suppression will be addressed in a follow-up PR.")]
class AndroidValueManager : JniRuntime.ReflectionJniValueManager {

Dictionary<IntPtr, IdentityHashTargets> instances = new Dictionary<IntPtr, IdentityHashTargets> ();

Expand Down
4 changes: 3 additions & 1 deletion src/Mono.Android/Microsoft.Android.Runtime/JavaMarshalValueManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

namespace Microsoft.Android.Runtime;

class JavaMarshalValueManager : JniRuntime.JniValueManager
[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This suppression will be addressed in a follow-up PR.")]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This suppression will be addressed in a follow-up PR.")]
class JavaMarshalValueManager : JniRuntime.ReflectionJniValueManager
{
const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;

Expand Down
8 changes: 3 additions & 5 deletions src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@

namespace Microsoft.Android.Runtime;

class ManagedTypeManager : JniRuntime.JniTypeManager {
[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This suppression will be addressed in a follow-up PR.")]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This suppression will be addressed in a follow-up PR.")]
class ManagedTypeManager : JniRuntime.ReflectionJniTypeManager {

const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;
internal const DynamicallyAccessedMemberTypes Methods = DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods;
internal const DynamicallyAccessedMemberTypes MethodsAndPrivateNested = Methods | DynamicallyAccessedMemberTypes.NonPublicNestedTypes;

public ManagedTypeManager ()
{
}

[return: DynamicallyAccessedMembers (Constructors)]
protected override Type? GetInvokerTypeCore (
[DynamicallyAccessedMembers (Constructors)]
Expand Down
4 changes: 3 additions & 1 deletion src/Mono.Android/Microsoft.Android.Runtime/SimpleValueManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

namespace Microsoft.Android.Runtime;

class SimpleValueManager : JniRuntime.JniValueManager
[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This suppression will be addressed in a follow-up PR.")]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This suppression will be addressed in a follow-up PR.")]
class SimpleValueManager : JniRuntime.ReflectionJniValueManager
{
const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;

Expand Down
4 changes: 3 additions & 1 deletion src/Mono.Android/Microsoft.Android.Runtime/TrimmableTypeMapTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ namespace Microsoft.Android.Runtime;
/// Type manager for the trimmable typemap path. Delegates type lookups
/// to <see cref="TrimmableTypeMap"/>.
/// </summary>
class TrimmableTypeMapTypeManager : JniRuntime.JniTypeManager
[UnconditionalSuppressMessage ("Trimming", "IL2026", Justification = "This suppression will be addressed in a follow-up PR.")]
[UnconditionalSuppressMessage ("Trimming", "IL3050", Justification = "This suppression will be addressed in a follow-up PR.")]
class TrimmableTypeMapTypeManager : JniRuntime.ReflectionJniTypeManager
{
const string NoSimpleReference = "\0";
readonly ConcurrentDictionary<Type, string> _simpleReferenceCache = new ();
Expand Down
24 changes: 12 additions & 12 deletions ...ks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.MonoVM.apkdesc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,34 @@
"Size": 22384
},
"lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
"Size": 18232
"Size": 18224
},
"lib/arm64-v8a/lib_Java.Interop.dll.so": {
"Size": 87720
"Size": 92552
},
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
"Size": 118392
"Size": 118544
},
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
"Size": 26848
"Size": 26856
},
"lib/arm64-v8a/lib_System.Console.dll.so": {
"Size": 24360
},
"lib/arm64-v8a/lib_System.Linq.dll.so": {
"Size": 25432
"Size": 25552
},
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
"Size": 638568
"Size": 704944
},
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
"Size": 20224
},
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
"Size": 19752
"Size": 19760
},
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
"Size": 19968
"Size": 19976
},
"lib/arm64-v8a/libarc.bin.so": {
"Size": 19296
Expand All @@ -44,10 +44,10 @@
"Size": 36416
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 1385800
"Size": 1387008
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3111840
"Size": 3111632
},
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
"Size": 72344
Expand All @@ -62,7 +62,7 @@
"Size": 162000
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 19832
"Size": 19680
},
"res/drawable-hdpi-v4/icon.png": {
"Size": 2178
Expand All @@ -89,5 +89,5 @@
"Size": 1904
}
},
"PackageSize": 3254606
"PackageSize": 3320142
}
Loading