From b83d2344602e40b039b60415d4a5d86a91b1fc5b Mon Sep 17 00:00:00 2001 From: Redth Date: Thu, 5 Oct 2017 13:42:22 -0400 Subject: [PATCH 1/2] Bump Java.Interop This includes a fix to detect api.xml style java docs when using ClassParse --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index f3750484417..4d6c5a94868 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit f3750484417f52b996cb2c3a9061df79ca258b68 +Subproject commit 4d6c5a9486827432492b129702fad98df26d5835 From 32e1849571875f716128a891a8ca4f02376dd56a Mon Sep 17 00:00:00 2001 From: Redth Date: Thu, 5 Oct 2017 13:51:36 -0400 Subject: [PATCH 2/2] Add ApiXmlPaths input to ClassParse This will allow api.xml style documents to be specified as java doc inputs for the ClassParse task. Java.Interop already knows how to handle this doc source type. --- src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs | 5 ++++- .../Xamarin.Android.Bindings.targets | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs index 678c9c73380..e66a54f3eac 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs @@ -31,12 +31,14 @@ public class ClassParse : Task public ITaskItem [] DroidDoc2Paths { get; set; } + public ITaskItem [] ApiXmlDocPaths { get; set; } + public ITaskItem [] JavaDocs { get; set; } public IEnumerable DocsPaths { get { Func> f = l => l ?? Enumerable.Empty (); - return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths)).Concat (f (JavaDocs)); + return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths)).Concat (f (ApiXmlDocPaths)).Concat (f (JavaDocs)); } } @@ -50,6 +52,7 @@ public override bool Execute () Log.LogTaskItems (" Java8DocPaths: ", Java8DocPaths); Log.LogTaskItems (" DroidDocPaths: ", DroidDocPaths); Log.LogTaskItems (" DroidDoc2Paths: ", DroidDoc2Paths); + Log.LogTaskItems (" ApiXmlDocPaths: ", ApiXmlDocPaths); Log.LogTaskItems (" JavaDocs: ", JavaDocs); using (var output = new StreamWriter (OutputFile, append: false, diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets index 3bf10950e5f..df463149367 100755 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets @@ -372,6 +372,7 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved. Java7DocPaths="$(Java7DocPaths)" Java8DocPaths="$(Java8DocPaths)" DroidDocPaths="$(DroidDocPaths)" + ApiXmlDocPaths="$(ApiXmlDocPaths)" JavaDocs="@(JavaDocJar->'$(IntermediateOutputPath)javadocs\%(FileName)')" />