-
Notifications
You must be signed in to change notification settings - Fork 564
Bump to Java.Interop/master/00ad8d6 #978
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.
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
Conversation
|
@jonathanpeppers, |
|
I think something isn't quite right: It's causing the |
|
I'll see if it happens for me locally tomorrow. That test looks like it gets skipped on Java.Interop: https://jenkins.mono-project.com/view/Xamarin.Android/job/Java.Interop/164/testReport/Xamarin.Android.Tools.BytecodeTests/ParameterFixupTests/XmlDeclaration_FixedUpFromDocumentation/ I hope it means this test only runs under Xamarin.Android, and I didn't break something else. |
That is correct: that test only runs when executed within xamarin-android, not separately. |
Context: dotnet/android#978 When bumping java.interop in xamarin-android, a test failure occurred in the `ClassPath.GetDocletType` method. This was added in dotnet#188, but since `ANDROID_SDK_PATH` is not set during java.interop’s test runs the test was skipped. The incoming `path` can be a directory, so the `File.OpenText` call will fail in that case. Added a `File.Exists` check as a fix.
Context: dotnet/android#978 (comment) Commit 4d6c5a9 had a minor problem: it updated `ClassPath.GetDocletType()` to check to see if the `path` parameter was an `api.xml`-compatible XML file, but *earlier in the method* it was *required* that `path` be a *directory*. These semantics can't be intermixed, and resulted in an error from `Xamarin.Android.Tools.BytecodeTests.ParameterFixupTests.XmlDeclaration_FixedUpFromDocumentation()` during a xamarin-android integration PR: An unexpected exception was thrown : System.UnauthorizedAccessException: Access to the path '/Users/builder/android-toolchain/sdk/docs/reference' is denied. Additionally, further code review demonstrated suggested that the `ClassPath.DocletType` property was fundamentally *broken*: `ClassPath.DocumentationPaths` can contain *multiple* paths, of possibly *different* types, but `ClassPath.DocletType` -- if set -- was used for *all* `ClassPath.DocumentationPaths` values. This doesn't make sense, in any way. Remove `ClassPath.DocletType`, and update `class-parse --docstype` documentation to note that it's obsolete. Move `ClassPath.GetDocletType()` to `AndroidDocScraper.GetDocletType()`, and make it public, so that it can now be unit tested. Fix the semantics of `AndroidDocScraper.GetDocletType(string path)` so that `path` can be a directory or a file, as appropriate, without generating an error in `XmlDeclaration_FixedUpFromDocumentation()`. Cleanup the unit tests.
Changes as needed by dotnet#949
66cc657 to
8730a93
Compare
Changes: dotnet/java-interop@2a882d2...4787e01 * dotnet/java-interop@4787e017: [Java.Base-Tests] Test Java-to-Managed invocations for Java.Base (dotnet#975) * dotnet/java-interop@59716252: [build] `main` *conceptually* targets .NET 7 (dotnet#978) * dotnet/java-interop@61cdb40d: [generator] Fix reserved keywords binary search (dotnet#977)
Changes: dotnet/java-interop@2a882d2...843f3c7 * dotnet/java-interop@843f3c78: [Java.Base-Tests] Use $(UtilityOutputFullPath)/jcw-gen.dll (#979) * dotnet/java-interop@4787e017: [Java.Base-Tests] Test Java-to-Managed invocations for Java.Base (#975) * dotnet/java-interop@59716252: [build] `main` *conceptually* targets .NET 7 (#978) * dotnet/java-interop@61cdb40d: [generator] Fix reserved keywords binary search (#977)
Changes: dotnet/java-interop@2a882d2...843f3c7 * dotnet/java-interop@843f3c78: [Java.Base-Tests] Use $(UtilityOutputFullPath)/jcw-gen.dll (#979) * dotnet/java-interop@4787e017: [Java.Base-Tests] Test Java-to-Managed invocations for Java.Base (#975) * dotnet/java-interop@59716252: [build] `main` *conceptually* targets .NET 7 (#978) * dotnet/java-interop@61cdb40d: [generator] Fix reserved keywords binary search (#977)
Changes as needed by #949