From 8b48fbacb798f3da2227c8063ae5a59dcda3b580 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Thu, 23 Apr 2020 20:30:01 -0500 Subject: [PATCH 1/3] TEST: Test out custom delegates. --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index ce8dc4001bd..dec74041407 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit ce8dc4001bd7b5ab84c42b9b27711755f051cd2d +Subproject commit dec740414072fcae135ad991d6ae9b1119c47801 From 0747efd1d96f35a81ce9c0cdc8cbb5b6e8315aa3 Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Fri, 24 Apr 2020 09:31:20 -0500 Subject: [PATCH 2/3] Add bindings tests for overriding Kotlin unsigned types. --- .../Jars/KotlinUnsignedTypes.jar | Bin 6613 -> 7013 bytes .../Jars/UnsignedMethods.kt | 12 ++++++++++++ 2 files changed, 12 insertions(+) diff --git a/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Jars/KotlinUnsignedTypes.jar b/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Jars/KotlinUnsignedTypes.jar index a2aa6ef44cad2a5d7265cf896e3b4cdf5ce5ac11..05d38faeafb84a9a8bf2de73b6f86db3f42c5ea6 100644 GIT binary patch delta 5044 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 delta 4638 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 L#oecLf4lz=7H_cp diff --git a/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Jars/UnsignedMethods.kt b/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Jars/UnsignedMethods.kt index bef735db303..15a7abb12d6 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Jars/UnsignedMethods.kt +++ b/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/Jars/UnsignedMethods.kt @@ -52,6 +52,12 @@ open class UnsignedInterfaceImplementedMethods : UnsignedInterface { open class UnsignedAbstractImplementedMethods : UnsignedAbstractClass () { public override open fun unsignedAbstractMethod (value: UInt) : UInt { return value; } + public override open fun unsignedAbstractMethodUShort (value: UShort) : UShort { return value; } + + public override open fun unsignedAbstractMethodULong (value: ULong) : ULong { return value; } + + public override open fun unsignedAbstractMethodUByte (value: UByte) : UByte { return value; } + override var unsignedAbstractClassProperty: UInt = 3u } @@ -59,6 +65,12 @@ open class UnsignedAbstractImplementedMethods : UnsignedAbstractClass () { abstract class UnsignedAbstractClass { abstract fun unsignedAbstractMethod (value: UInt) : UInt + abstract fun unsignedAbstractMethodUShort (value: UShort) : UShort + + abstract fun unsignedAbstractMethodULong (value: ULong) : ULong + + abstract fun unsignedAbstractMethodUByte (value: UByte) : UByte + abstract var unsignedAbstractClassProperty: UInt } From 7e09ed80742f8db1b22f060a303dcf50787c8ada Mon Sep 17 00:00:00 2001 From: Jonathan Pobst Date: Fri, 24 Apr 2020 10:25:52 -0500 Subject: [PATCH 3/3] Bump JI. --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index dec74041407..3a24821e77c 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit dec740414072fcae135ad991d6ae9b1119c47801 +Subproject commit 3a24821e77cea30a64831a8179786ba4f62dfc0c