Skip to content
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

Jump to bottom

Bump to xamarin/Java.Interop/master@fdc200cc #5468

Merged
merged 1 commit into from
Jan 7, 2021
Merged

Bump to xamarin/Java.Interop/master@fdc200cc #5468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 7574f1 to fdc200
2 changes: 0 additions & 2 deletions ...n.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ This file is only used by binding projects.
Outputs="$(ApiOutputFile)">

<ItemGroup>
<!-- TODO: add when `ClassPath` supports `<api api-source="java-source-utils">`
<_AndroidDocumentationPath Include="@(_JavaSourceJavadocXml)" />
-->
<_AndroidDocumentationPath Include="@(JavaDocIndex->'%(RootDir)\%(Directory)')" />
<_AndroidDocumentationPath Include="$(JavaDocPaths)" />
<_AndroidDocumentationPath Include="$(Java7DocPaths)" />
Expand Down
14 changes: 7 additions & 7 deletions tests/CodeGen-Binding/Xamarin.Android.JcwGen-Tests/BindingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ public void Arrays ()
{
using (var dh = new Com.Xamarin.Android.DataHandler ()) {
EventHandler<Com.Xamarin.Android.DataEventArgs> h = (o, e) => {
Assert.AreEqual ("fromNode", e.P0);
Assert.AreEqual ("fromChannel", e.P1);
Assert.AreEqual ("payloadType", e.P2);
for (int i = 0; i < e.P3.Length; ++i) {
for (int j = 0; j < e.P3 [i].Length; ++j) {
Assert.AreEqual ("fromNode", e.FromNode);
Assert.AreEqual ("fromChannel", e.FromChannel);
Assert.AreEqual ("payloadType", e.PayloadType);
for (int i = 0; i < e.Payload.Length; ++i) {
for (int j = 0; j < e.Payload [i].Length; ++j) {
byte expected = (byte) (((i+1)*10) + (j+1));
Assert.AreEqual ((byte)(expected + 'J'), e.P3 [i][j]);
e.P3 [i][j] = expected;
Assert.AreEqual ((byte)(expected + 'J'), e.Payload [i][j]);
e.Payload [i][j] = expected;
}
}
};
Expand Down