From e16ea0485120028ee9ca08b00a98d831d809eace Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Fri, 14 Feb 2025 16:09:47 -0500 Subject: [PATCH 1/2] Try dotnet/java-interop#1308 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Does It Build™? --- .gitmodules | 2 +- external/Java.Interop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index c5443e9db15..52973d82b44 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,7 +13,7 @@ [submodule "external/Java.Interop"] path = external/Java.Interop url = https://github.com/dotnet/java-interop - branch = main + branch = dev/jonp/jonp-CreatePeer-uses-fallback [submodule "external/libunwind"] path = external/libunwind url = https://github.com/libunwind/libunwind.git diff --git a/external/Java.Interop b/external/Java.Interop index d62008d1ad7..e323d1b55e0 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit d62008d1ad7f469f801c7c00613f3a9fc94648a1 +Subproject commit e323d1b55e0056b434e2b65eec44978c644a430c From 9db84989b678105a99f67ec85f349367b5a17169 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Sat, 15 Feb 2025 09:55:58 -0500 Subject: [PATCH 2/2] Bump to dotnet/java-interop/main@2a7183a1 Changes: ...2a7183a1c0d0f072b90fa836dd39d015d7a8c78d --- .gitmodules | 2 +- external/Java.Interop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 52973d82b44..c5443e9db15 100644 --- 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-CreatePeer-uses-fallback + 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 index e323d1b55e0..2a7183a1c0d 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit e323d1b55e0056b434e2b65eec44978c644a430c +Subproject commit 2a7183a1c0d0f072b90fa836dd39d015d7a8c78d