Skip to content

Bump to xamarin/Java.Interop/main@445ee6cd #8524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 5 commits into from
Nov 22, 2023
Merged

Bump to xamarin/Java.Interop/main@445ee6cd #8524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de64eb7
Try xamarin/java.interop#1166!
jonpryor Nov 20, 2023
b0e9b1c
Update ProGuard rules.
jonpryor Nov 21, 2023
9aee2ab
Fix member remap tests
jonpryor Nov 22, 2023
8712550
Merge remote-tracking branch 'origin/main' into jonp-try-ji-1166
jonpryor Nov 22, 2023
d6ed69e
Bump to xamarin/Java.Interop/main@445ee6cd
jonpryor Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from 25850b to 445ee6
4 changes: 2 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Resources/proguard_xamarin.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
-dontobfuscate

-keep class android.support.multidex.MultiDexApplication { <init>(); }
-keep class com.xamarin.java_interop.** { *; <init>(); }
-keep class net.dot.jni.** { *; <init>(); }
-keep class mono.MonoRuntimeProvider* { *; <init>(...); }
-keep class mono.MonoPackageManager { *; <init>(...); }
-keep class mono.MonoPackageManager_Resources { *; <init>(...); }
Expand All @@ -14,7 +14,7 @@
-keep class opentk.GameViewBase { *; <init>(...); }
-keep class opentk_1_0.platform.android.AndroidGameView { *; <init>(...); }
-keep class opentk_1_0.GameViewBase { *; <init>(...); }
-keep class com.xamarin.java_interop.ManagedPeer { *; <init>(...); }
-keep class net.dot.jni.ManagedPeer { *; <init>(...); }
-keep class xamarin.android.net.ServerCertificateCustomValidator_TrustManager { *; <init>(...); }
-keep class xamarin.android.net.ServerCertificateCustomValidator_TrustManager_FakeSSLSession { *; <init>(...); }
-keep class xamarin.android.net.ServerCertificateCustomValidator_AlwaysAcceptingHostnameVerifier { *; <init>(...); }
Expand Down
6 changes: 3 additions & 3 deletions src/java-runtime/java-runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
</ItemGroup>

<ItemGroup>
<AllRuntimeSource Include="java/mono/**/*.java" />
<AllRuntimeSource Include="..\..\src-ThirdParty\bazel\java\mono\**\*.java" />
<AllRuntimeSource Include="$(JavaInteropSourceDirectory)\src\Java.Interop\java\com\xamarin\**\*.java" />
<AllRuntimeSource Include="java/**/*.java" />
<AllRuntimeSource Include="..\..\src-ThirdParty\bazel\java\**\*.java" />
<AllRuntimeSource Include="$(JavaInteropSourceDirectory)\src\Java.Interop\java\**\*.java" />
</ItemGroup>

<Import Project="java-runtime.targets" />
Expand Down
14 changes: 7 additions & 7 deletions tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Remaps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<replacements>
<replace-type
from="com/xamarin/interop/RenameClassBase1"
to="com/xamarin/interop/RenameClassBase2" />
from="net/dot/jni/test/RenameClassBase1"
to="net/dot/jni/test/RenameClassBase2" />
<replace-type
from="com/xamarin/interop/AndroidInterface"
to="com/xamarin/interop/DesugarAndroidInterface$_CC" />
from="net/dot/jni/test/AndroidInterface"
to="net/dot/jni/test/DesugarAndroidInterface$_CC" />
<replace-method
source-type="java/lang/Object"
source-method-name="remappedToToString"
Expand All @@ -14,17 +14,17 @@
<replace-method
source-type="java/lang/Object"
source-method-name="remappedToStaticHashCode"
target-type="com/xamarin/interop/ObjectHelper"
target-type="net/dot/jni/test/ObjectHelper"
target-method-name="getHashCodeHelper" target-method-instance-to-static="true" />
<replace-method
source-type="java/lang/Runtime"
source-method-name="remappedToGetRuntime"
target-type="java/lang/Runtime"
target-method-name="getRuntime" target-method-instance-to-static="false" />
<replace-method
source-type="com/xamarin/interop/RenameClassBase2"
source-type="net/dot/jni/test/RenameClassBase2"
source-method-name="hashCode"
source-method-signature="()"
target-type="com/xamarin/interop/RenameClassBase2"
target-type="net/dot/jni/test/RenameClassBase2"
target-method-name="myNewHashCode" target-method-instance-to-static="false" />
</replacements>
2 changes: 1 addition & 1 deletion tests/Mono.Android-Tests/proguard.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Need to preserve the contents of Mono.Android-Test-classes.jar

-keep class com.xamarin.interop.** { *; <init>(); }
-keep class net.dot.jni.test.** { *; <init>(); }