Merge remote-tracking branch 'origin/main' into jonp-iface-invokers-910

jonpryor · jonpryor · commit 7815e846465b · 2023-10-23T13:39:31.000-04:00
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 9c50a2d08038d91bbf3dd66c250dd480623a60d4
+Subproject commit 8a971d94a3fa2f0e8f69c5cf742c6836c14be1cd
diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="..\Directory.Build.props" />
+</Project>
diff --git a/src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaFieldModel.cs b/src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaFieldModel.cs
@@ -43,5 +43,13 @@ public override void Resolve (JavaTypeCollection types, ICollection<JavaUnresolv
 				return;
 			}
 		}
+
+		public override string ToString ()
+		{
+			if (DeclaringType != null)
+				return $"[Field] {DeclaringType.FullName}.{Name}";
+
+			return $"[Field] {Name}";
+		}
 	}
 }
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt
@@ -157,6 +157,7 @@ public partial class AnimationEndEventArgs : global::System.EventArgs {
 
 }
 
+[global::Android.Runtime.Register ("mono/java/code/AnimatorListenerImplementor")]
 internal sealed partial class AnimatorListenerImplementor : global::Java.Lang.Object, AnimatorListener {
 
 	object sender;
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt
@@ -88,6 +88,7 @@ public partial class AnimationEndEventArgs : global::System.EventArgs {
 
 }
 
+[global::Android.Runtime.Register ("mono/java/code/AnimatorListenerImplementor")]
 internal sealed partial class AnimatorListenerImplementor : global::Java.Lang.Object, AnimatorListener {
 
 	object? sender;
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt
@@ -157,6 +157,7 @@ public partial class AnimationEndEventArgs : global::System.EventArgs {
 
 }
 
+[global::Android.Runtime.Register ("mono/java/code/AnimatorListenerImplementor")]
 internal sealed partial class AnimatorListenerImplementor : global::Java.Lang.Object, AnimatorListener {
 
 	object sender;
diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs b/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs
@@ -1138,6 +1138,12 @@ public void FixupDeprecatedBaseMethods ()
 
 			var gens = ParseApiDefinition (xml);
 
+			// Override method should not be marked deprecated because it's: deprecated='not deprecated'
+			Assert.IsNull (gens.Single (g => g.Name == "MyClass").Methods.Single (m => m.Name == "DoStuff").Deprecated);
+
+			options.FixObsoleteOverrides = true;
+			gens = ParseApiDefinition (xml);
+
 			// Override method should be marked deprecated because base method is
 			Assert.AreEqual ("deprecated", gens.Single (g => g.Name == "MyClass").Methods.Single (m => m.Name == "DoStuff").Deprecated);
 		}
@@ -1158,6 +1164,7 @@ public void FixupDeprecatedSinceBaseMethods ()
 			  </package>
 			</api>";
 
+			options.FixObsoleteOverrides = true;
 			var gens = ParseApiDefinition (xml);
 
 			// Override method should match base method's 'deprecated-since'
diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs
@@ -88,6 +88,7 @@ public unsafe void OnClick (global::Android.Views.View v)
 
 		}
 
+		[global::Android.Runtime.Register ("mono/android/view/View_OnClickListenerImplementor")]
 		internal sealed partial class IOnClickListenerImplementor : global::Java.Lang.Object, IOnClickListener {
 			public unsafe IOnClickListenerImplementor () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)
 			{
diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs
@@ -141,6 +141,7 @@ public byte[] P4 {
 
 	}
 
+	[global::Android.Runtime.Register ("mono/com/google/android/exoplayer/drm/ExoMediaDrm_OnEventListenerImplementor")]
 	internal sealed partial class IExoMediaDrmOnEventListenerImplementor : global::Java.Lang.Object, IExoMediaDrmOnEventListener {
 
 		object sender;
diff --git a/tools/class-parse/Program.cs b/tools/class-parse/Program.cs
@@ -8,6 +8,8 @@
 using Mono.Options;
 
 using Xamarin.Android.Tools.Bytecode;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Xamarin.Android.Tools {
 
@@ -159,6 +161,32 @@ static void DumpClassFile (ClassFile c, TextWriter output)
 					output.WriteLine ("\t\t{0}", attr);
 				}
 			}
+
+			// Output Kotlin metadata if it exists
+			var kotlin_metadata = c.Attributes.OfType<RuntimeVisibleAnnotationsAttribute> ()
+				.FirstOrDefault ()?.Annotations
+				.FirstOrDefault (a => a.Type == "Lkotlin/Metadata;");
+
+			if (kotlin_metadata is not null) {
+				var meta = KotlinMetadata.FromAnnotation (kotlin_metadata);
+				var jopt = new JsonSerializerOptions {
+					ReferenceHandler    = ReferenceHandler.Preserve,
+					WriteIndented       = true,
+				};
+
+				if (meta.AsClassMetadata () is KotlinClass kc) {
+					output.WriteLine ();
+					var json = JsonSerializer.Serialize (kc, jopt);
+					output.WriteLine ($"Kotlin Class Metadata [{meta.MetadataVersion}]: {json}");
+				} else if (meta.AsFileMetadata () is KotlinFile kf) {
+					output.WriteLine ();
+					var json = JsonSerializer.Serialize (kf, jopt);
+					output.WriteLine ($"Kotlin File Metadata [{meta.MetadataVersion}]: {json}");
+				}
+
+				output.WriteLine ();
+				output.WriteLine ($"Kotlin Metadata String Table: {JsonSerializer.Serialize (meta.Data2, jopt)}");
+			}
 		}
 	}
 }
diff --git a/tools/generator/CodeGenerationOptions.cs b/tools/generator/CodeGenerationOptions.cs
@@ -66,6 +66,7 @@ public      SymbolTable             SymbolTable             {
 		public bool UseShallowReferencedTypes { get; set; }
 		public bool UseObsoletedOSPlatformAttributes { get; set; }
 		public bool UseRestrictToAttributes { get; set; }
+		public bool FixObsoleteOverrides { get; set; }
 		public bool RemoveConstSugar => BuildingCoreAssembly;
 
 		bool? buildingCoreAssembly;
diff --git a/tools/generator/CodeGenerator.cs b/tools/generator/CodeGenerator.cs
@@ -86,6 +86,7 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve
 				UseObsoletedOSPlatformAttributes = options.UseObsoletedOSPlatformAttributes,
 				UseRestrictToAttributes = options.UseRestrictToAttributes,
 				EmitLegacyInterfaceInvokers      = options.EmitLegacyInterfaceInvokers,
+				FixObsoleteOverrides = options.FixObsoleteOverrides,
 			};
 			var resolverCache       = new TypeDefinitionCache ();
 
diff --git a/tools/generator/CodeGeneratorOptions.cs b/tools/generator/CodeGeneratorOptions.cs
@@ -54,6 +54,7 @@ public CodeGeneratorOptions ()
 		public bool		    SupportNestedInterfaceTypes { get; set; }
 		public bool		    SupportNullableReferenceTypes { get; set; }
 		public bool		    UseRestrictToAttributes { get; set; }
+		public bool		    FixObsoleteOverrides { get; set;} = true;
 		public bool		    UseLegacyJavaResolver { get; set; }
 		public bool			UseObsoletedOSPlatformAttributes { get; set; }
 
@@ -106,6 +107,7 @@ public static CodeGeneratorOptions Parse (string[] args)
 					v => opts.ApiLevel = v },
 				{ "lang-features=",
 					"For internal use. (Flags: interface-constants,default-interface-methods,nested-interface-types,nullable-reference-types,obsoleted-platform-attributes,restrict-to-attributes,emit-legacy-interface-invokers)",
+					"For internal use. (Flags: interface-constants,default-interface-methods,nested-interface-types,nullable-reference-types,obsoleted-platform-attributes,restrict-to-attributes,do-not-fix-obsolete-overrides,emit-legacy-interface-invokers)",
 					v => {
 						opts.EmitLegacyInterfaceInvokers = v?.Contains ("emit-legacy-interface-invokers") == true;
 						opts.SupportInterfaceConstants = v?.Contains ("interface-constants") == true;
@@ -114,6 +116,7 @@ public static CodeGeneratorOptions Parse (string[] args)
 						opts.SupportNullableReferenceTypes = v?.Contains ("nullable-reference-types") == true;
 						opts.UseObsoletedOSPlatformAttributes = v?.Contains ("obsoleted-platform-attributes") == true;
 						opts.UseRestrictToAttributes = v?.Contains ("restrict-to-attributes") == true;
+						opts.FixObsoleteOverrides = v?.Contains ("do-not-fix-obsolete-overrides") == false;
 						}},
 				{ "preserve-enums",
 					"For internal use.",
diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs
@@ -311,13 +311,15 @@ public void FixupMethodOverrides (CodeGenerationOptions opt)
 					if (bm != null && bm.RetVal.FullName == m.RetVal.FullName) { // if return type is different, it could be still "new", not "override".
 						m.IsOverride = true;
 
-						// If method overrides a deprecated method, it also needs to be marked as deprecated
-						if (bm.Deprecated.HasValue () && !m.Deprecated.HasValue ())
-							m.Deprecated = bm.Deprecated;
-
-						// Fix issue when base method was deprecated before the overriding method, set both both to base method value
-						if (bm.DeprecatedSince.GetValueOrDefault (0) < m.DeprecatedSince.GetValueOrDefault (0))
-							m.DeprecatedSince = bm.DeprecatedSince;
+						if (opt.FixObsoleteOverrides) {
+							// If method overrides a deprecated method, it also needs to be marked as deprecated
+							if (bm.Deprecated.HasValue () && !m.Deprecated.HasValue ())
+								m.Deprecated = bm.Deprecated;
+
+							// Fix issue when base method was deprecated before the overriding method, set both both to base method value
+							if (bm.DeprecatedSince.GetValueOrDefault (0) < m.DeprecatedSince.GetValueOrDefault (0))
+								m.DeprecatedSince = bm.DeprecatedSince;
+						}
 
 						break;
 					}
diff --git a/tools/generator/SourceWriters/InterfaceEventHandlerImplClass.cs b/tools/generator/SourceWriters/InterfaceEventHandlerImplClass.cs
@@ -27,6 +27,7 @@ public InterfaceEventHandlerImplClass (InterfaceGen iface, CodeGenerationOptions
 				type.Nullable = opt.SupportNullableReferenceTypes;
 				Fields.Add (new FieldWriter { Name = "sender", Type = type });
 			}
+			Attributes.Add (new RegisterAttr (jni_class, additionalProperties: iface.AdditionalAttributeString ()) { UseGlobal = true });
 
 			AddConstructor (iface);
 			AddMethods (iface, opt);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<Project>`
	`2`	`+ <Import Project="..\Directory.Build.props" />`
	`3`	`+</Project>`
Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,13 @@ public override void Resolve (JavaTypeCollection types, ICollection<JavaUnresolv`
`43`	`43`	`return;`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ public override string ToString ()`
	`48`	`+ {`
	`49`	`+ if (DeclaringType != null)`
	`50`	`+ return $"[Field] {DeclaringType.FullName}.{Name}";`
	`51`	`+`
	`52`	`+ return $"[Field] {Name}";`
	`53`	`+ }`
`46`	`54`	`}`
`47`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ public partial class AnimationEndEventArgs : global::System.EventArgs {`
`157`	`157`
`158`	`158`	`}`
`159`	`159`
	`160`	`+[global::Android.Runtime.Register ("mono/java/code/AnimatorListenerImplementor")]`
`160`	`161`	`internal sealed partial class AnimatorListenerImplementor : global::Java.Lang.Object, AnimatorListener {`
`161`	`162`
`162`	`163`	`object sender;`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ public partial class AnimationEndEventArgs : global::System.EventArgs {`
`88`	`88`
`89`	`89`	`}`
`90`	`90`
	`91`	`+[global::Android.Runtime.Register ("mono/java/code/AnimatorListenerImplementor")]`
`91`	`92`	`internal sealed partial class AnimatorListenerImplementor : global::Java.Lang.Object, AnimatorListener {`
`92`	`93`
`93`	`94`	`object? sender;`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ public unsafe void OnClick (global::Android.Views.View v)`
`88`	`88`
`89`	`89`	`}`
`90`	`90`
	`91`	`+ [global::Android.Runtime.Register ("mono/android/view/View_OnClickListenerImplementor")]`
`91`	`92`	`internal sealed partial class IOnClickListenerImplementor : global::Java.Lang.Object, IOnClickListener {`
`92`	`93`	`public unsafe IOnClickListenerImplementor () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer)`
`93`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ public byte[] P4 {`
`141`	`141`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ [global::Android.Runtime.Register ("mono/com/google/android/exoplayer/drm/ExoMediaDrm_OnEventListenerImplementor")]`
`144`	`145`	`internal sealed partial class IExoMediaDrmOnEventListenerImplementor : global::Java.Lang.Object, IExoMediaDrmOnEventListener {`
`145`	`146`
`146`	`147`	`object sender;`