fix(core): adjust ProGuard rules (#6588)

tauri-apps · Mar 31, 2023 · adf4627 · adf4627
1 parent 56fa900
commit adf4627
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/.changes/fix-proguard-rules.md b/.changes/fix-proguard-rules.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Fixes ProGuard rules.
diff --git a/core/tauri/mobile/android/proguard-rules.pro b/core/tauri/mobile/android/proguard-rules.pro
@@ -1,11 +1,21 @@
 -keep class app.tauri.** {
   @app.tauri.JniMethod public <methods>;
+  native <methods>;
 }
 
--keep class app.tauri.JSArray,app.tauri.JSObject {
+-keep class app.tauri.plugin.JSArray {
   public <init>(...);
 }
 
+-keepclassmembers class org.json.JSONArray {
+  public put(...);
+}
+
+-keep class app.tauri.plugin.JSObject {
+  public <init>(...);
+  public put(...);
+}
+
 -keep @app.tauri.annotation.TauriPlugin public class * {
   @app.tauri.annotation.Command public <methods>;
   @app.tauri.annotation.PermissionCallback <methods>;

diff --git a/core/tauri/mobile/proguard-tauri.pro b/core/tauri/mobile/proguard-tauri.pro
@@ -1,6 +1,10 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 
--keep class $PACKAGE.TauriActivity {
+-keep class $PACKAGE.* {
+  native <methods>;
+}
+
+-keepclassmembers class $PACKAGE.TauriActivity {
   getAppClass(...);
   getVersion();
 }
@@ -22,3 +26,5 @@
 -keep class $PACKAGE.MainActivity {
   public getPluginManager();
 }
+
+-keep class androidx.appcompat.app.AppCompatActivity { }