Add support for consumer ProGuard usage

developernotes · developernotes · commit 4da04a10180d · 2025-12-18T09:39:58.000-06:00
diff --git a/sqlcipher/build.gradle b/sqlcipher/build.gradle
@@ -16,7 +16,7 @@ android {
         // "pm clear" command after each test invocation. This command ensures
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
-        consumerProguardFile 'consumer-rules.pro'
+        consumerProguardFiles 'consumer-rules.pro'
     }
 
     buildTypes {
diff --git a/sqlcipher/consumer-rules.pro b/sqlcipher/consumer-rules.pro
@@ -1,18 +1,14 @@
--keep class net.zetetic.** {
-  native <methods>;
-  private native <methods>;
-  public <init>(...);
-  long mNativeHandle;
-}
+# Keep SQLCipher classes and JNI descriptors
+-keep,includedescriptorclasses class net.zetetic.database.** { *; }
+-keep,includedescriptorclasses interface net.zetetic.database.** { *; }
 
--keepclassmembers class net.zetetic.database.sqlcipher.SQLiteCustomFunction {
-  public java.lang.String name;
-  public int numArgs;
-  private void dispatchCallback(java.lang.String[]);
+# Keep native methods
+-keepclasseswithmembernames class net.zetetic.database.** {
+    native <methods>;
 }
 
--keepclassmembers class net.zetetic.database.sqlcipher.SQLiteDebug$PagerStats {
-  public int largestMemAlloc;
-  public int memoryUsed;
-  public int pageCacheOverflow;
-}
+# Prevent warnings for optional Android APIs
+-dontwarn net.zetetic.database.**
+
+# Support Room with annontation-based reflection support
+-keepattributes *Annotation*

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ android {`
`16`	`16`	`// "pm clear" command after each test invocation. This command ensures`
`17`	`17`	`// that the app's state is completely cleared between tests.`
`18`	`18`	`testInstrumentationRunnerArguments clearPackageData: 'true'`
`19`		`- consumerProguardFile 'consumer-rules.pro'`
	`19`	`+ consumerProguardFiles 'consumer-rules.pro'`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`buildTypes {`