From 48354cafe8ffcada0becda44ddf8e46fcf14d729 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 19 Mar 2025 10:48:07 -0400 Subject: [PATCH 1/3] Try dotnet/java-interop#1326 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Context: https://github.com/dotnet/java-interop/pull/1326 Does It Build™? --- .gitmodules | 2 +- external/Java.Interop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index c5443e9db15..48764ed39c2 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-Class.forName [submodule "external/libunwind"] path = external/libunwind url = https://github.com/libunwind/libunwind.git diff --git a/external/Java.Interop b/external/Java.Interop index bc44f085f67..b8e729f8662 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit bc44f085f6785abb2e3d2a9533a70b2f63d681b8 +Subproject commit b8e729f86621de0d132c818c3c4a4fbed9324be1 From 1fa3bf54ee885dca8bbbea41817b413452e1fdad Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 19 Mar 2025 13:51:54 -0400 Subject: [PATCH 2/3] =?UTF-8?q?=E2=80=A6and=20again=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will hopefully fix the `Java.Lang.ClassNotFoundException` that was seen in the previous commit. --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index b8e729f8662..6611420102c 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit b8e729f86621de0d132c818c3c4a4fbed9324be1 +Subproject commit 6611420102c9a503e77105c14352ae1df7146d00 From a523cde0bb388bdff6667b613ff1ecca3e1a7788 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 20 Mar 2025 12:29:11 -0400 Subject: [PATCH 3/3] Bump to dotnet/java-interop/main@5852e6e3 Fixes: https://github.com/dotnet/java-interop/issues/23 Changes: https://github.com/dotnet/java-interop/compare/bc44f085f6785abb2e3d2a9533a70b2f63d681b8...5852e6e398a6c96d42fff3ed4b8a5d4b5a0abf97 * dotnet/java-interop@5852e6e3: [Java.Interop] Use `Class.forName()` as fallback to load Java classes (dotnet/java-interop#1326) --- .gitmodules | 2 +- external/Java.Interop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 48764ed39c2..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-Class.forName + 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 6611420102c..5852e6e398a 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 6611420102c9a503e77105c14352ae1df7146d00 +Subproject commit 5852e6e398a6c96d42fff3ed4b8a5d4b5a0abf97