From 069a0ef7e7b7bd67ea32fb0db0398ab917c76e52 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 29 Jan 2025 13:06:57 -0500 Subject: [PATCH 1/5] Try dotnet/java-interop#1295 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 ea5f83ceb43..0fdd4c12cd0 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-add-JniValueManager.GetPeer [submodule "external/libunwind"] path = external/libunwind url = https://github.com/libunwind/libunwind.git diff --git a/external/Java.Interop b/external/Java.Interop index 9b1d8781e8e..4f3be333a34 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 9b1d8781e8e322849d05efac32119c913b21c192 +Subproject commit 4f3be333a3460e9e61b6845babf47e5c76efb491 From 642803e070cf12fa79d84dc3f8cb706dcbfca4dc Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 29 Jan 2025 14:33:58 -0500 Subject: [PATCH 2/5] Try again? --- external/Java.Interop | 2 +- .../AndroidValueManagerContractTests.cs | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/Mono.Android-Tests/Java.Interop-Tests/Java.InteropTests/AndroidValueManagerContractTests.cs diff --git a/external/Java.Interop b/external/Java.Interop index 4f3be333a34..c5a022c9d38 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 4f3be333a3460e9e61b6845babf47e5c76efb491 +Subproject commit c5a022c9d38e76a9bdc5d854c656b7f8522c2ced diff --git a/tests/Mono.Android-Tests/Java.Interop-Tests/Java.InteropTests/AndroidValueManagerContractTests.cs b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.InteropTests/AndroidValueManagerContractTests.cs new file mode 100644 index 00000000000..74033ebcb7c --- /dev/null +++ b/tests/Mono.Android-Tests/Java.Interop-Tests/Java.InteropTests/AndroidValueManagerContractTests.cs @@ -0,0 +1,19 @@ +#nullable enable + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Threading; + +using Java.Interop; + +using NUnit.Framework; + +namespace Java.InteropTests { + [TestFixture] + public class AndroidValueManagerContractTests : JniRuntimeJniValueManagerContract { + + protected override Type ValueManagerType => typeof (Android.Runtime.AndroidValueManager); + } +} From 084c592f2a8064547b6dd8b5e55bd8c068fe4e8e Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 29 Jan 2025 15:44:01 -0500 Subject: [PATCH 3/5] Again! --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index c5a022c9d38..bf25acea0f0 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit c5a022c9d38e76a9bdc5d854c656b7f8522c2ced +Subproject commit bf25acea0f01ce8d7759f0187771092f70557305 From 7c816a58dcaaf02cfa8a4c7d640d7bcd0833d6c1 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 29 Jan 2025 17:22:06 -0500 Subject: [PATCH 4/5] Doh! --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index bf25acea0f0..01a0448619e 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit bf25acea0f01ce8d7759f0187771092f70557305 +Subproject commit 01a0448619e8f13d89894f63eda7d8a496af7856 From 459c6cc6102b42cbea131da3f5f9c7512c110305 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 30 Jan 2025 08:27:59 -0500 Subject: [PATCH 5/5] Bump to dotnet/java-interop/main@e288589d Changes: https://github.com/dotnet/java-interop/compare/9b1d8781e8e322849d05efac32119c913b21c192...e288589d92afc9edd9070638ebed72f67e310117 * dotnet/java-interop@e288589d: [Java.Interop] Add JniRuntime.JniValueManager.GetPeer() (dotnet/java-interop#1295) * dotnet/java-interop@bbb15b71: [ci] Add dev/* branches to CI trigger (dotnet/java-interop#1297) --- .gitmodules | 2 +- external/Java.Interop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0fdd4c12cd0..ea5f83ceb43 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-add-JniValueManager.GetPeer + 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 01a0448619e..e288589d92a 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 01a0448619e8f13d89894f63eda7d8a496af7856 +Subproject commit e288589d92afc9edd9070638ebed72f67e310117