dotnet/java-interop#1305 is merged! bump to main!

dotnet · Feb 12, 2025 · 753f04c · 753f04c
1 parent eadfcab
commit 753f04c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,7 +13,7 @@
 [submodule "external/Java.Interop"]
     path = external/Java.Interop
     url = https://github.com/dotnet/java-interop
-    branch = dev/jonp/jonp-GetTypeSignatures-when-Java.Interop-has-typemaps
+    branch = main
 [submodule "external/libunwind"]
     path = external/libunwind
     url = https://github.com/libunwind/libunwind.git

diff --git a/external/Java.Interop b/external/Java.Interop
+0 −1		tests/Java.Interop.Dynamic-Tests/Java.Interop.Dynamic-Tests.csproj
+142 −0		tests/generator-Tests/Unit-Tests/BlittableTypeTests.cs
+6 −6		tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt
+6 −6		...generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt
+9 −0		tests/generator-Tests/Unit-Tests/CodeGeneratorTestBase.cs
+3 −3		tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs
+2 −2		tests/generator-Tests/expected.xaji/GenericArguments/__NamespaceMapping__.cs
+3 −3		tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs
+2 −2		tests/generator-Tests/expected.xaji/Streams/__NamespaceMapping__.cs
+3 −3		tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs
+3 −3		tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs
+3 −3		tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs
+2 −2		tests/generator-Tests/expected.xaji/TestInterface/__NamespaceMapping__.cs
+2 −0		tools/generator/CodeGenerationOptions.cs
+2 −2		tools/generator/Java.Interop.Tools.Generator.ObjectModel/ReturnValue.cs
+2 −0		tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/FormatSymbol.cs
+13 −0		tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/ISymbol.cs
+2 −2		tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/SymbolTable.cs
+7 −4		tools/generator/SourceWriters/BoundFieldAsProperty.cs
+1 −1		tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs