Skip to content

Stop generating dead Java.Interop.__TypeRegistrations #11664

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

Closed
Copilot wants to merge 10 commits into from
Closed

Stop generating dead Java.Interop.__TypeRegistrations #11664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ead101
Initial plan
Copilot Jun 16, 2026
928af63
Stop generating type registrations
Copilot Jun 16, 2026
fbfbe73
Update Java.Interop type registrations generator
Copilot Jun 16, 2026
84b1643
Preserve RegisterPackage validation
Copilot Jun 16, 2026
bb16088
Plan review feedback fix
Copilot Jun 16, 2026
f1021e4
Throw for unsupported package registration APIs
Copilot Jun 16, 2026
8b83c95
Restore submodule pointers
Copilot Jun 16, 2026
f4bb1ce
Push restored submodule pointers
Copilot Jun 16, 2026
9e02795
Restore submodule pointers
Copilot Jun 16, 2026
21a2d53
Clean unsupported package registration method
Copilot Jun 16, 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 from b881d2 to cc8a0a
35 changes: 6 additions & 29 deletions src/Mono.Android/Java.Interop/TypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,47 +453,24 @@ public static void RegisterType (string java_class, Type t)
}
}

static Dictionary<string, List<Converter<string, Type?>>>? packageLookup;

[MemberNotNull (nameof (packageLookup))]
static void LazyInitPackageLookup ()
{
if (packageLookup == null)
packageLookup = new Dictionary<string, List<Converter<string, Type?>>> (StringComparer.Ordinal);
}

public static void RegisterPackage (string package, Converter<string, Type> lookup)

@simonrozsival simonrozsival Jun 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this method should throw NotSupportedException

{
LazyInitPackageLookup ();

lock (packageLookup!) {
if (!packageLookup.TryGetValue (package, out var lookups))
packageLookup.Add (package, lookups = new List<Converter<string, Type?>> ());
lookups.Add (lookup);
}
if (package == null)
throw new ArgumentNullException ("package");
if (lookup == null)
throw new ArgumentNullException ("lookup");
throw new NotSupportedException ();
}

public static void RegisterPackages (string[] packages, Converter<string, Type?>[] lookups)

@simonrozsival simonrozsival Jun 16, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this method should throw NotSupportedException

{
LazyInitPackageLookup ();

if (packages == null)
throw new ArgumentNullException ("packages");
if (lookups == null)
throw new ArgumentNullException ("lookups");
if (packages.Length != lookups.Length)
throw new ArgumentException ("`packages` and `lookups` arrays must have same number of elements.");

lock (packageLookup!) {
for (int i = 0; i < packages.Length; ++i) {
string package = packages [i];
var lookup = lookups [i];

if (!packageLookup.TryGetValue (package, out var _lookups))
packageLookup.Add (package, _lookups = new List<Converter<string, Type?>> ());
_lookups.Add (lookup);
}
}
throw new NotSupportedException ();
}

[Register ("mono/android/TypeManager", DoNotGenerateAcw = true)]
Expand Down
Loading