[MS-742] Use a single ProGuard Rules File

Simprints · Sep 27, 2024 · 3739da9 · 3739da9
1 parent 6d7a34b
commit 3739da9
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 117 deletions.
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -29,26 +29,20 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
                 }
 
                 buildFeatures.buildConfig = true
-                buildTypes {
-                    getByName(BuildTypes.release) {
-                        isMinifyEnabled = true
-                        proguardFiles(
-                            getDefaultProguardFile("proguard-android-optimize.txt"),
-                            "$rootDir/build-logic/proguard-rules.pro"
-                        )
-                    }
-                    create(BuildTypes.staging) {
-                        isMinifyEnabled = true
-                        proguardFiles(
-                            getDefaultProguardFile("proguard-android-optimize.txt"),
-                            "$rootDir/build-logic/proguard-rules.pro"
-                        )
-                    }
-                    getByName(BuildTypes.debug) {
-                        isMinifyEnabled = false
+                    buildTypes {
+                        // In a library module, we generally don’t need to
+                        // add any specific configurations here because the app module handles shrinking,
+                        // obfuscation, and signing. Leaving this block empty means the default behavior is inherited.
+                        getByName(BuildTypes.release) {
+                        }
+
+                        create(BuildTypes.staging) {
+                        }
+
+                        getByName(BuildTypes.debug) {
+                        }
+                        configureDebugModeBuildTypes()
                     }
-                    configureDebugModeBuildTypes()
-                }
             }
 
             dependencies {

diff --git a/build-logic/proguard-rules.pro b/build-logic/proguard-rules.pro
diff --git a/fingerprint/infra/scanner/build.gradle.kts b/fingerprint/infra/scanner/build.gradle.kts
@@ -5,9 +5,6 @@ plugins {
 android {
     namespace = "com.simprints.fingerprint.infra.scanner"
 
-    defaultConfig {
-        consumerProguardFiles("consumer-rules.pro")
-    }
 }
 
 dependencies {

diff --git a/fingerprint/infra/scanner/consumer-rules.pro b/fingerprint/infra/scanner/consumer-rules.pro
diff --git a/fingerprint/infra/simafis-wrapper/build.gradle.kts b/fingerprint/infra/simafis-wrapper/build.gradle.kts
@@ -4,10 +4,6 @@ plugins {
 
 android {
     namespace = "com.simprints.fingerprint.infra.simafiswrapper"
-
-    defaultConfig {
-        consumerProguardFiles("consumer-rules.pro")
-    }
 }
 
 dependencies {

diff --git a/fingerprint/infra/simafis-wrapper/consumer-rules.pro b/fingerprint/infra/simafis-wrapper/consumer-rules.pro
diff --git a/id/proguard-rules.pro b/id/proguard-rules.pro
@@ -58,6 +58,9 @@
 #net.zetetic:android-database-sqlcipher
 -keep class net.sqlcipher.** { *; }
 
+# Dont warn about the missing files during the obfuscation
+-dontwarn com.simprints.**
+
 # Do not obfuscate names in simprints package
 -keep class com.simprints.** { *; }
 # Keep all marshallable classes as-is
@@ -88,3 +91,8 @@
 # Keep Hilt components and related Dagger generated code
 -keep class * extends dagger.hilt.internal.GeneratedComponentManager { *; }
 -keep class * extends dagger.hilt.internal.GeneratedComponent { *; }
+-keep class **.hilt_aggregated_deps.** { *; }
+
+-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
+    <fields>;
+}
diff --git a/infra/config-store/build.gradle.kts b/infra/config-store/build.gradle.kts
@@ -6,9 +6,6 @@ plugins {
 android {
     namespace = "com.simprints.infra.config.store"
 
-    defaultConfig {
-        consumerProguardFiles("consumer-rules.pro")
-    }
 }
 
 dependencies {

diff --git a/infra/config-store/consumer-rules.pro b/infra/config-store/consumer-rules.pro
diff --git a/infra/config-sync/consumer-rules.pro b/infra/config-sync/consumer-rules.pro
diff --git a/infra/recent-user-activity/build.gradle.kts b/infra/recent-user-activity/build.gradle.kts
@@ -5,13 +5,8 @@ plugins {
 
 android {
     namespace = "com.simprints.infra.recent.user.activity"
-
-    defaultConfig {
-        consumerProguardFiles("consumer-rules.pro")
-    }
 }
 
-
 dependencies {
     implementation(libs.datastore)
 }
diff --git a/infra/recent-user-activity/consumer-rules.pro b/infra/recent-user-activity/consumer-rules.pro
diff --git a/infra/sync/consumer-rules.pro b/infra/sync/consumer-rules.pro