Skip to content

Generator support for api.xml style java docs for parameter names #916

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
Redth wants to merge 2 commits into from
Closed

Generator support for api.xml style java docs for parameter names #916

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
b83d234
Bump Java.Interop
Redth Oct 5, 2017
32e1849
Add ApiXmlPaths input to ClassParse
Redth Oct 5, 2017
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 f37504 to 4d6c5a
5 changes: 4 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ITaskItem> DocsPaths {
get {
Func<ITaskItem[],IEnumerable<ITaskItem>> f = l => l ?? Enumerable.Empty<ITaskItem> ();
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));
}
}

Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)')"
/>

Expand Down