xamarin
/
xamarin-android
зеркало из https://github.com/xamarin/xamarin-android.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[Xamarin.Android.Build.Tasks] Support updated DroidDoc (#274) 

* [Mono.Android] update API description with the latest class-parse output.

It seems to add java.util.Hashmap#put() override, which does not affect
the public API.

* [Mono.Android] add API Level 25 description.

Since there is no documentation component yet, it is actually generated
with API Level 24 docs, so it lacks parameter names for newly added
abstract methods that class-parse cannnot extract. But there is only one
method that falls to the issue.

* [msbuild] add new droiddoc related arguments in ClassParse task.

Note that this task is not functional enough to support javadocs correctly
as it does not distinguish doclet type while it pretends to be able to.
This commit is contained in:
Atsushi Eno 2016-10-22 03:15:06 +09:00 коммит произвёл Jonathan Pryor
Родитель 875e3488c7
Коммит cac0f33f23
14 изменённых файлов: 211927 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
external/Java.Interop поставляемый

@ -1 +1 @@
Subproject commit 8dac926ea20027ad4ad8b18f1eba0c87f68c8394
Subproject commit b4e151e1715a8dcaa584dfb84b98c8424050d5b0

10
src/Mono.Android/Profiles/api-10.xml.in
Просмотреть файл

@ -98523,6 +98523,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -102651,6 +102657,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-15.xml.in
Просмотреть файл

@ -115818,6 +115818,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -119976,6 +119982,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-16.xml.in
Просмотреть файл

@ -119677,6 +119677,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -123835,6 +123841,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-17.xml.in
Просмотреть файл

@ -122346,6 +122346,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -126504,6 +126510,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-18.xml.in
Просмотреть файл

@ -126344,6 +126344,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -130502,6 +130508,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-19.xml.in
Просмотреть файл

@ -131422,6 +131422,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -135641,6 +135647,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-20.xml.in
Просмотреть файл

@ -131942,6 +131942,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -136161,6 +136167,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-21.xml.in
Просмотреть файл

@ -150173,6 +150173,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -154573,6 +154579,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-22.xml.in
Просмотреть файл

@ -150770,6 +150770,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -155170,6 +155176,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

10
src/Mono.Android/Profiles/api-23.xml.in
Просмотреть файл

@ -160006,6 +160006,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -164406,6 +164412,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

16
src/Mono.Android/Profiles/api-24.xml.in
Просмотреть файл

@ -180265,6 +180265,12 @@
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="entrySet" native="false" return="java.util.Set&lt;java.util.Map.Entry&lt;K, V&gt;&gt;" static="false" synchronized="false" visibility="public">
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="put" native="false" return="V" static="false" synchronized="false" visibility="public">
<parameter name="key" type="K">
</parameter>
<parameter name="value" type="V">
</parameter>
</method>
</class>
<class abstract="true" deprecated="not deprecated" extends="java.util.AbstractSet" extends-generic-aware="java.util.AbstractSet&lt;E&gt;" final="false" name="EnumSet" static="false" visibility="public">
<implements name="java.io.Serializable" name-generic-aware="java.io.Serializable">
@ -185949,12 +185955,6 @@
<parameter name="reducer" type="java.util.function.BiFunction&lt;? super U, ? super U, ? extends U&gt;">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="reduceEntries" native="false" return="java.util.Map.Entry&lt;K, V&gt;" static="false" synchronized="false" visibility="public">
<parameter name="parallelismThreshold" type="long">
</parameter>
<parameter name="reducer" type="java.util.function.BiFunction&lt;java.util.Map.Entry&lt;K, V&gt;, java.util.Map.Entry&lt;K, V&gt;, ? extends java.util.Map.Entry&lt;K, V&gt;&gt;">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="reduceEntries" native="false" return="U" static="false" synchronized="false" visibility="public">
<typeParameters>
<typeParameter name="U"></typeParameter>
@ -187129,6 +187129,10 @@
<parameter name="c" type="java.util.Collection&lt;? extends E&gt;">
</parameter>
</constructor>
<method abstract="false" deprecated="not deprecated" final="false" name="add" native="false" return="boolean" static="false" synchronized="false" visibility="public">
<parameter name="e" type="E">
</parameter>
</method>
<method abstract="false" deprecated="not deprecated" final="false" name="drainTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="c" type="java.util.Collection&lt;? super E&gt;">
</parameter>

211808
src/Mono.Android/Profiles/api-25.xml.in Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

13
src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs
Просмотреть файл

@ -29,10 +29,12 @@ namespace Xamarin.Android.Tasks
public ITaskItem[] DroidDocPaths { get; set; }
public ITaskItem [] DroidDoc2Paths { 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));
return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths));
}
}
@ -41,10 +43,11 @@ namespace Xamarin.Android.Tasks
Log.LogDebugMessage ("ClassParse Task");
Log.LogDebugMessage (" OutputFile: {0}", OutputFile);
Log.LogTaskItems (" SourceJars: ", SourceJars);
Log.LogTaskItems (" JavaDocsPaths: ", JavaDocPaths);
Log.LogTaskItems (" Java7DocsPaths: ", Java7DocPaths);
Log.LogTaskItems (" Java8DocsPaths: ", Java8DocPaths);
Log.LogTaskItems (" DroidDocsPaths: ", DroidDocPaths);
Log.LogTaskItems (" JavaDocPaths: ", JavaDocPaths);
Log.LogTaskItems (" Java7DocPaths: ", Java7DocPaths);
Log.LogTaskItems (" Java8DocPaths: ", Java8DocPaths);
Log.LogTaskItems (" DroidDocPaths: ", DroidDocPaths);
Log.LogTaskItems (" DroidDoc2Paths: ", DroidDoc2Paths);
using (var output = new StreamWriter (OutputFile, append: false,
encoding: new UTF8Encoding (encoderShouldEmitUTF8Identifier: false))) {