Merge pull request #42 from jonpryor/jonp-jcw-gen-custom-app

[Java.Interop.Tools.JavaCallableWrappers] Support MultiDexApplication

Author: atsushieno

src/Java.Interop.Tools.JavaCallableWrappers/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGenerator.cs

@@ -65,6 +65,8 @@ public JavaCallableWrapperGenerator (TypeDefinition type, Action<string, object[
 			}
 		}
 
+		public  string          ApplicationJavaClass            { get; set; }
+
 		public bool UseSharedRuntime;
 
 		public bool GenerateOnCreateOverrides { get; set; }
@@ -530,6 +532,8 @@ void GenerateHeader (TextWriter sw)
 			sw.WriteLine ("public " + (type.IsAbstract ? "abstract " : "") + "class " + name);
 
 			string extendsType = GetJavaTypeName (type.BaseType);
+			if (extendsType == "android.app.Application" && !string.IsNullOrEmpty (ApplicationJavaClass))
+				extendsType = ApplicationJavaClass;
 			sw.WriteLine ("\textends " + extendsType);
 			sw.WriteLine ("\timplements");
 			sw.Write ("\t\tmono.android.IGCUserPeer");

src/Java.Interop.Tools.JavaCallableWrappers/Test/Java.Interop.Tools.JavaCallableWrappers/JavaCallableWrapperGeneratorTests.cs

@@ -94,51 +94,55 @@ public void GenerateInParallel ()
 		}
 
 		[Test]
-		public void GenerateApplication ()
+		public void GenerateApplication (
+				[Values (null, "android.app.Application", "android.support.multidex.MultiDexApplication")] string applicationJavaClass
+		)
 		{
-			var actual      = Generate (typeof (ApplicationName));
-			var expected    = @"package application;
+			var actual      = Generate (typeof (ApplicationName), applicationJavaClass);
+			var expected    = $@"package application;
 
 
 public class Name
-	extends android.app.Application
+	extends {applicationJavaClass ?? "android.app.Application"}
 	implements
 		mono.android.IGCUserPeer
-{
+{{
 /** @hide */
 	public static final String __md_methods;
-	static {
+	static {{
 		__md_methods = 
 			"""";
-	}
+	}}
 
 	public Name ()
-	{
+	{{
 		mono.MonoPackageManager.setContext (this);
-	}
+	}}
 
 	private java.util.ArrayList refList;
 	public void monodroidAddReference (java.lang.Object obj)
-	{
+	{{
 		if (refList == null)
 			refList = new java.util.ArrayList ();
 		refList.add (obj);
-	}
+	}}
 
 	public void monodroidClearReferences ()
-	{
+	{{
 		if (refList != null)
 			refList.clear ();
-	}
-}
+	}}
+}}
 ";
 			Assert.AreEqual (expected, actual);
 		}
 
-		static string Generate (Type type)
+		static string Generate (Type type, string applicationJavaClass = null)
 		{
 			var td  = SupportDeclarations.GetTypeDefinition (type);
-			var g   = new JavaCallableWrapperGenerator (td, null);
+			var g   = new JavaCallableWrapperGenerator (td, null) {
+				ApplicationJavaClass        = applicationJavaClass,
+			};
 			var o   = new StringWriter ();
 			g.Generate ("__o");
 			g.Generate (o);
@@ -147,9 +151,11 @@ static string Generate (Type type)
 
 
 		[Test]
-		public void GenerateIndirectApplication ()
+		public void GenerateIndirectApplication (
+				[Values (null, "android.app.Application", "android.support.multidex.MultiDexApplication")] string applicationJavaClass
+		)
 		{
-			var actual      = Generate (typeof (IndirectApplication));
+			var actual      = Generate (typeof (IndirectApplication), applicationJavaClass);
 			var expected    = @"package md5fef72cac46d04ae5bdc90af5bb6221ad;