Skip to content

[generator] Replace ApiXmlAdjuster with Java.Interop.Tools.JavaTypeSystem #849

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

Merged
merged 18 commits into from
Oct 26, 2021
Merged

[generator] Replace ApiXmlAdjuster with Java.Interop.Tools.JavaTypeSystem #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8ff7333
New Java type resolution phase to replace ApiXmlAdjuster.
jpobst Jun 7, 2021
cbb5bfa
Various fixes to better match ApiXmlAdjuster output.
jpobst Jun 16, 2021
ada8709
More fixes.
jpobst Jun 18, 2021
97700da
Start cleaning up code.
jpobst Jun 22, 2021
3385061
Port ApiXmlAdjuster-Tests.
jpobst Jun 23, 2021
c706842
Add MSBuild warnings.
jpobst Jun 23, 2021
f80502d
Wire up -use-legacy-java-resolver.
jpobst Jun 24, 2021
b90a412
Fix two issues.
jpobst Jun 25, 2021
5bebbb6
Expand JavaList exclusions.
jpobst Jun 25, 2021
c793444
GPS/FB fixes
jpobst Jun 29, 2021
66a9cbc
Better diagnostic error messages.
jpobst Jun 30, 2021
a548274
Output verbose diagnostic messages.
jpobst Jun 30, 2021
2a5f995
Output verbose diagnostic messages.
jpobst Jun 30, 2021
d06a80a
Clean test code out of CodeGenerator.cs.
jpobst Jun 30, 2021
4fe6e5d
Specify OutputPath.
jpobst Jun 30, 2021
565c125
Address some review feedback.
jpobst Jul 7, 2021
e033ffd
Address more feedback.
jpobst Sep 30, 2021
d76710f
Use Collection<T> instead of List<T>.
jpobst Oct 25, 2021
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
14 changes: 14 additions & 0 deletions Java.Interop.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "invocation-overhead", "test
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeTiming", "tests\NativeTiming\NativeTiming.csproj", "{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Java.Interop.Tools.JavaTypeSystem", "src\Java.Interop.Tools.JavaTypeSystem\Java.Interop.Tools.JavaTypeSystem.csproj", "{B173F53B-986C-4E0D-881C-063BBB116E1D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaTypeSystem-Tests", "tests\Java.Interop.Tools.JavaTypeSystem-Tests\Java.Interop.Tools.JavaTypeSystem-Tests.csproj", "{11942DE9-AEC2-4B95-87AB-CA707C37643D}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 5
Expand Down Expand Up @@ -284,6 +288,14 @@ Global
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B}.Release|Any CPU.Build.0 = Release|Any CPU
{B173F53B-986C-4E0D-881C-063BBB116E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B173F53B-986C-4E0D-881C-063BBB116E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B173F53B-986C-4E0D-881C-063BBB116E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B173F53B-986C-4E0D-881C-063BBB116E1D}.Release|Any CPU.Build.0 = Release|Any CPU
{11942DE9-AEC2-4B95-87AB-CA707C37643D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{11942DE9-AEC2-4B95-87AB-CA707C37643D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11942DE9-AEC2-4B95-87AB-CA707C37643D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11942DE9-AEC2-4B95-87AB-CA707C37643D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -332,6 +344,8 @@ Global
{998D178B-F4C7-48B5-BDEE-44E2F869BB22} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{3CF58D34-693C-408A-BFE7-BC5E4BE44A26} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{BF5A4019-F2FF-45AC-949D-EF7E8C94196B} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
{B173F53B-986C-4E0D-881C-063BBB116E1D} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
{11942DE9-AEC2-4B95-87AB-CA707C37643D} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {29204E0C-382A-49A0-A814-AD7FBF9774A5}
Expand Down
18 changes: 18 additions & 0 deletions src/Java.Interop.Localization/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/Java.Interop.Localization/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,14 @@ The following terms should not be translated: &lt;package&gt;.</comment>
<value>Could not find top ancestor type '{0}' for nested type '{1}'.</value>
<comment>{0}, {1} - .NET types.</comment>
</data>
<data name="Generator_BG8605" xml:space="preserve">
<value>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</value>
<comment>{0} - Java type.</comment>
</data>
<data name="Generator_BG8606" xml:space="preserve">
<value>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</value>
<comment>The following terms should not be translated: java-resolution-report.log</comment>
</data>
<data name="Generator_BG8700" xml:space="preserve">
<value>Unknown return type '{0}' for member '{1}'.</value>
<comment>{0} - Java type.
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
10 changes: 10 additions & 0 deletions src/Java.Interop.Localization/xlf/Resources.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,16 @@ The following terms should not be translated: &lt;package&gt;.</note>
<target state="new">Could not find top ancestor type '{0}' for nested type '{1}'.</target>
<note>{0}, {1} - .NET types.</note>
</trans-unit>
<trans-unit id="Generator_BG8605">
<source>The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</source>
<target state="new">The Java type '{0}' could not be found (are you missing a Java reference jar/aar or a Java binding library NuGet?)</target>
<note>{0} - Java type.</note>
</trans-unit>
<trans-unit id="Generator_BG8606">
<source>Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</source>
<target state="new">Some types or members could not be bound because referenced Java types could not be found. See the 'java-resolution-report.log' file for details.</target>
<note>The following terms should not be translated: java-resolution-report.log</note>
</trans-unit>
<trans-unit id="Generator_BG8700">
<source>Unknown return type '{0}' for member '{1}'.</source>
<target state="new">Unknown return type '{0}' for member '{1}'.</target>
Expand Down
Loading