add proguard fix crash on release version

BreakZero · May 4, 2024 · 4255b48 · 4255b48
1 parent 4f12d67
commit 4255b48
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/Wallet-Android/app/build.gradle.kts b/Wallet-Android/app/build.gradle.kts
@@ -11,8 +11,8 @@ plugins {
 android {
     defaultConfig {
         applicationId = "com.easy.wallet"
-        versionCode = 1000000001
-        versionName = "v0.1.0-alpha01"
+        versionCode = 1000000002
+        versionName = "v0.1.0-alpha02"
     }
     namespace = "com.easy.wallet"
     val keyProperties = keyStoreProperties()

diff --git a/Wallet-iOS/Wallet-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Wallet-iOS/Wallet-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "4aaca083adb7f7c463d3b3009eb18b527e576afe1f0c1b73349b5a18c238917b",
+  "originHash" : "609133b310e9c4579a1d75e9696445b51bd516493282d44ac82bc290103e37c2",
   "pins" : [
     {
       "identity" : "kmp-nativecoroutines",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/rickclephas/KMP-NativeCoroutines.git",
       "state" : {
-        "branch" : "master",
-        "revision" : "c71d81529c7daf2b3178be71475c2f14276f5fd7"
+        "revision" : "c71d81529c7daf2b3178be71475c2f14276f5fd7",
+        "version" : "1.0.0-ALPHA-28"
       }
     },
     {
@@ -18,24 +18,6 @@
         "revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
         "version" : "6.6.0"
       }
-    },
-    {
-      "identity" : "swift-async-algorithms",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-async-algorithms.git",
-      "state" : {
-        "revision" : "da4e36f86544cdf733a40d59b3a2267e3a7bbf36",
-        "version" : "1.0.0"
-      }
-    },
-    {
-      "identity" : "swift-collections",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-collections.git",
-      "state" : {
-        "revision" : "94cf62b3ba8d4bed62680a282d4c25f9c63c2efb",
-        "version" : "1.1.0"
-      }
     }
   ],
   "version" : 3

diff --git a/...et-iOS/Wallet-iOS.xcodeproj/xcuserdata/jin.xcuserdatad/xcschemes/xcschememanagement.plist b/...et-iOS/Wallet-iOS.xcodeproj/xcuserdata/jin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Wallet-iOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>10</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/platform/database/build.gradle.kts b/platform/database/build.gradle.kts
@@ -35,6 +35,9 @@ kotlin {
 
 android {
     namespace = "com.easy.wallet.database"
+    defaultConfig {
+        consumerProguardFile("consumer-rules.pro")
+    }
 }
 
 sqldelight {

diff --git a/platform/database/consumer-rules.pro b/platform/database/consumer-rules.pro
@@ -0,0 +1,2 @@
+-keep,includedescriptorclasses class net.sqlcipher.** { *; }
+-keep,includedescriptorclasses interface net.sqlcipher.** { *; }
diff --git a/platform/shared/build.gradle.kts b/platform/shared/build.gradle.kts
@@ -86,6 +86,9 @@ kotlin {
 
 android {
     namespace = "com.easy.wallet.shared"
+    defaultConfig {
+        consumerProguardFile("consumer-rules.pro")
+    }
 }
 
 skie {

diff --git a/platform/shared/consumer-rules.pro b/platform/shared/consumer-rules.pro
@@ -0,0 +1,2 @@
+-keep class wallet.core.jni.** { *; }
+-keep class wallet.core.jni.proto.** { *; }