Skip to content

Commit

Permalink
Bump to jonpryor/Java.Interop/jonp-bump-mt-5.4.1
Browse files Browse the repository at this point in the history
Context: dotnet/java-interop#740

Does It Build™?!
  • Loading branch information
jonpryor committed Oct 19, 2020
1 parent caca5c8 commit aa714e5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
branch = master
[submodule "external/Java.Interop"]
path = external/Java.Interop
url = https://github.com/xamarin/java.interop.git
branch = master
url = https://github.com/jonpryor/java.interop.git
branch = jonp-bump-mt-5.4.1
[submodule "external/lz4"]
path = external/lz4
url = https://github.com/lz4/lz4.git
Expand Down
1 change: 1 addition & 0 deletions build-tools/installers/create-installers.targets
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@
<_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.CompilerServices.SymbolWriter.pdb" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\Mono.Options.dll" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\LineEditor.dll" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " />
<_MSBuildFiles Include="$(MSBuildSrcDir)\LineEditor.pdb" Condition=" '$(PackageId)' != 'Microsoft.Android.Sdk' " />
<_MSBuildFiles Include="$(MSBuildSrcDir)\monodoc.dll" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\monodoc.pdb" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\MULTIDEX_JAR_LICENSE" />
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Submodule Java.Interop updated 65 files
+8 −2 build-tools/automation/azure-pipelines.yaml
+1 −1 external/xamarin-android-tools
+1 −0 src/Java.Interop/Java.Interop-MonoAndroid.csproj
+3 −1 src/Java.Interop/Java.Interop.csproj
+8 −1 src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiTypeResolverExtensions.cs
+25 −5 src/Xamarin.Android.Tools.Bytecode/Kotlin/KotlinFixups.cs
+11 −0 src/Xamarin.SourceWriter/Models/PropertyWriter.cs
+1 −1 tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/JavaApiTestHelper.cs
+32 −0 tests/Xamarin.Android.Tools.ApiXmlAdjuster-Tests/TypeResolverTest.cs
+9 −0 tests/Xamarin.Android.Tools.Bytecode-Tests/KotlinFixupsTests.cs
+ tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClass.class
+3 −1 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalClass.kt
+ tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalInterface.class
+3 −1 tests/Xamarin.Android.Tools.Bytecode-Tests/kotlin/InternalInterface.kt
+55 −0 tests/generator-Tests/Unit-Tests/CodeGenerationOptionsTests.cs
+40 −0 tests/generator-Tests/Unit-Tests/CodeGeneratorContextTests.cs
+204 −0 tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt
+4 −0 ...tor-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypeMethodsClass.txt
+4 −0 ...-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt
+20 −0 tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs
+18 −0 tests/generator-Tests/Unit-Tests/XmlApiImporterTests.cs
+2 −0 tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs
+1 −0 tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs
+3 −0 tests/generator-Tests/expected.ji/Core_Jar2Xml/Android.Text.SpannableString.cs
+1 −0 tests/generator-Tests/expected.ji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs
+3 −0 tests/generator-Tests/expected.ji/Core_Jar2Xml/Android.Views.View.cs
+1 −0 tests/generator-Tests/expected.ji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs
+1 −0 tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs
+5 −0 tests/generator-Tests/expected.ji/NormalMethods/Xamarin.Test.SomeObject.cs
+1 −0 tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs
+2 −0 tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs
+1 −0 tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs
+1 −0 tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs
+2 −0 tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs
+2 −0 tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs
+1 −0 tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs
+1 −0 tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs
+1 −0 tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs
+3 −0 tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs
+1 −0 tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs
+11 −32 tools/generator/CodeGenerationOptions.cs
+1 −0 tools/generator/CodeGenerator.cs
+11 −6 tools/generator/CodeGeneratorContext.cs
+6 −6 tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs
+39 −18 tools/generator/Java.Interop.Tools.Generator.Importers/XmlApiImporter.cs
+2 −2 tools/generator/Java.Interop.Tools.Generator.ObjectModel/ClassGen.cs
+6 −2 tools/generator/Java.Interop.Tools.Generator.ObjectModel/Field.cs
+7 −3 tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs
+15 −0 tools/generator/Java.Interop.Tools.Generator.ObjectModel/ISourceLineInfo.cs
+2 −2 tools/generator/Java.Interop.Tools.Generator.ObjectModel/InterfaceGen.cs
+5 −1 tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs
+34 −4 tools/generator/Java.Interop.Tools.Generator.ObjectModel/Parameter.cs
+4 −2 tools/generator/Java.Interop.Tools.Generator.ObjectModel/ReturnValue.cs
+4 −0 tools/generator/SourceWriters/BoundConstructor.cs
+11 −2 tools/generator/SourceWriters/BoundInterface.cs
+4 −0 tools/generator/SourceWriters/BoundMethod.cs
+9 −6 tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs
+11 −4 tools/generator/SourceWriters/InterfaceEventArgsClass.cs
+2 −2 tools/generator/SourceWriters/InterfaceMemberAlternativeClass.cs
+103 −0 tools/generator/Utilities/ParsedType.cs
+3 −0 tools/generator/Utilities/Report.cs
+1 −0 tools/generator/generator.slnf
+8 −8 tools/jnimarshalmethod-gen/App.cs
+19 −6 tools/jnimarshalmethod-gen/TypeMover.cs
+2 −2 tools/logcat-parse/logcat-parse.csproj

0 comments on commit aa714e5

Please sign in to comment.