Skip to content

[generator] Place interface alternatives [Register] classes in dummy package. #1242

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

Merged
jonpryor merged 2 commits into from
Aug 21, 2024
Merged

[generator] Place interface alternatives [Register] classes in dummy package. #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
184ae5c
[generator] Place interface alternatives `[Register]` classes in dumm…
jpobst Aug 12, 2024
e72247f
Remove opt-out.
jpobst Aug 20, 2024
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
4 changes: 2 additions & 2 deletions ...rator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/java/code/IMyInterface", DoNotGenerateAcw=true)]
public abstract class MyInterface : Java.Lang.Object {
internal MyInterface ()
{
Expand All @@ -19,7 +19,7 @@ public abstract class MyInterface : Java.Lang.Object {

}

[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/java/code/IMyInterface", DoNotGenerateAcw=true)]
[global::System.Obsolete (@"Use the 'MyInterface' type. This type will be removed in a future release.", error: true)]
public abstract class MyInterfaceConsts : MyInterface {
private MyInterfaceConsts ()
Expand Down
2 changes: 1 addition & 1 deletion ...t-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Register ("com/xamarin/android/Parent", DoNotGenerateAcw=true)]
[Register ("mono/internal/com/xamarin/android/Parent", DoNotGenerateAcw=true)]
[global::System.Obsolete (@"Use the 'Com.Xamarin.Android.IParent' type. This class will be removed in a future release.")]
public abstract class Parent : Java.Lang.Object {
internal Parent ()
Expand Down
2 changes: 1 addition & 1 deletion ...Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/java/code/IMyInterface", DoNotGenerateAcw=true)]
public abstract class MyInterface : Java.Lang.Object {
internal MyInterface ()
{
Expand Down
4 changes: 2 additions & 2 deletions ...generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/java/code/IMyInterface", DoNotGenerateAcw=true)]
public abstract class MyInterface : Java.Lang.Object {
internal MyInterface ()
{
Expand All @@ -19,7 +19,7 @@ public abstract class MyInterface : Java.Lang.Object {

}

[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/java/code/IMyInterface", DoNotGenerateAcw=true)]
[global::System.Obsolete (@"Use the 'MyInterface' type. This type will be removed in a future release.", error: true)]
public abstract class MyInterfaceConsts : MyInterface {
private MyInterfaceConsts ()
Expand Down
4 changes: 2 additions & 2 deletions ...it-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Register ("com/xamarin/android/MyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/com/xamarin/android/MyInterface", DoNotGenerateAcw=true)]
public abstract class MyInterface : Java.Lang.Object {
internal MyInterface ()
{
Expand Down Expand Up @@ -32,7 +32,7 @@ public abstract class MyInterface : Java.Lang.Object {

}

[Register ("com/xamarin/android/MyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/com/xamarin/android/MyInterface", DoNotGenerateAcw=true)]
[global::System.Obsolete (@"Use the 'MyInterface' type. This type will be removed in a future release.", error: true)]
public abstract class MyInterfaceConsts : MyInterface {
private MyInterfaceConsts ()
Expand Down
4 changes: 2 additions & 2 deletions ...sts/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/java/code/IMyInterface", DoNotGenerateAcw=true)]
public abstract class MyInterface : Java.Lang.Object {
internal MyInterface ()
{
Expand All @@ -19,7 +19,7 @@ public abstract class MyInterface : Java.Lang.Object {

}

[Register ("java/code/IMyInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/java/code/IMyInterface", DoNotGenerateAcw=true)]
[global::System.Obsolete (@"Use the 'MyInterface' type. This type will be removed in a future release.", error: true)]
public abstract class MyInterfaceConsts : MyInterface {
private MyInterfaceConsts ()
Expand Down
4 changes: 2 additions & 2 deletions tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Test.ME {

[Register ("test/me/TestInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/test/me/TestInterface", DoNotGenerateAcw=true)]
public abstract class TestInterface : Java.Lang.Object {
internal TestInterface ()
{
Expand All @@ -31,7 +31,7 @@ internal TestInterface ()

}

[Register ("test/me/TestInterface", DoNotGenerateAcw=true)]
[Register ("mono/internal/test/me/TestInterface", DoNotGenerateAcw=true)]
[global::System.Obsolete (@"Use the 'TestInterface' type. This type will be removed in a future release.", error: true)]
public abstract class TestInterfaceConsts : TestInterface {
private TestInterfaceConsts ()
Expand Down
7 changes: 5 additions & 2 deletions tools/generator/SourceWriters/InterfaceMemberAlternativeClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ public InterfaceMemberAlternativeClass (InterfaceGen iface, CodeGenerationOption

SourceWriterExtensions.AddSupportedOSPlatform (Attributes, iface, opt);

Attributes.Add (new RegisterAttr (iface.RawJniName, noAcw: true, additionalProperties: iface.AdditionalAttributeString ()) { AcwLast = true });
// Place this class in a dummy package that won't conflict the actual interface
Attributes.Add (new RegisterAttr ("mono/internal/" + iface.RawJniName, noAcw: true, additionalProperties: iface.AdditionalAttributeString ()) { AcwLast = true });

if (should_obsolete)
SourceWriterExtensions.AddObsolete (Attributes, $"Use the '{iface.FullName}' type. This class will be removed in a future release.", opt);
Expand Down Expand Up @@ -179,7 +180,9 @@ public InterfaceConstsForwardClass (InterfaceGen iface, CodeGenerationOptions op
IsPublic = true;
IsAbstract = true;

Attributes.Add (new RegisterAttr (iface.RawJniName, noAcw: true, additionalProperties: iface.AdditionalAttributeString ()));
// Place this class in a dummy package that won't conflict the actual interface
Attributes.Add (new RegisterAttr ("mono/internal/" + iface.RawJniName, noAcw: true, additionalProperties: iface.AdditionalAttributeString ()));

SourceWriterExtensions.AddObsolete (Attributes, $"Use the '{iface.Name.Substring (1)}' type. This type will be removed in a future release.", opt, isError: true);

Constructors.Add (new ConstructorWriter {
Expand Down