[MS-742] Remove ProGuard rules from library modules and consolidate them in the app module

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 {

fingerprint/infra/scanner/build.gradle.kts

@@ -5,9 +5,6 @@ plugins {
 android {
     namespace = "com.simprints.fingerprint.infra.scanner"
 
-    defaultConfig {
-        consumerProguardFiles("consumer-rules.pro")
-    }
 }
 
 dependencies {

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 {

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
@@ -67,24 +70,7 @@
 -keep class retrofit2.** { *; }
 -keep interface retrofit2.** { *; }
 
-# Hilt
--keep class dagger.hilt.** { *; }
--keep class javax.inject.** { *; }
--keep class dagger.** { *; }
-
-# Prevent ProGuard from removing @Module, @Inject, @Binds, etc.
--keep class **Module { *; }
--keep class **Inject { *; }
--keep class **Provides { *; }
--keep class **Binds { *; }
--keep class **Hilt_** { *; }
-
-# Keep generated Hilt components
--keep class * implements dagger.hilt.internal.GeneratedComponent { *; }
 
-# Keep classes annotated with @InstallIn to prevent them from being removed
--keep @dagger.hilt.InstallIn class * { *; }
-
-# Keep Hilt components and related Dagger generated code
--keep class * extends dagger.hilt.internal.GeneratedComponentManager { *; }
--keep class * extends dagger.hilt.internal.GeneratedComponent { *; }
+-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
+    <fields>;
+}

infra/config-store/build.gradle.kts

@@ -6,9 +6,6 @@ plugins {
 android {
     namespace = "com.simprints.infra.config.store"
 
-    defaultConfig {
-        consumerProguardFiles("consumer-rules.pro")
-    }
 }
 
 dependencies {

infra/config-store/src/main/java/com/simprints/infra/config/store/ConfigStoreModule.kt

@@ -35,11 +35,11 @@ private const val DEVICE_CONFIG_DATA_STORE_FILE_NAME = "device_config_prefs.pb"
 
 @Module
 @InstallIn(SingletonComponent::class)
-abstract class ConfigManagerModule {
+abstract class ConfigStoreModule {
 
 
     @Binds
-    internal abstract fun provideconfigService(service: ConfigRepositoryImpl): ConfigRepository
+    internal abstract fun provideConfigRepository(service: ConfigRepositoryImpl): ConfigRepository
 
     @Binds
     internal abstract fun provideConfigRemoteDataSource(remoteDataSource: ConfigRemoteDataSourceImpl): ConfigRemoteDataSource

infra/images/src/main/java/com/simprints/infra/images/metadata/database/DbImageMetadata.kt

@@ -1,7 +1,7 @@
 package com.simprints.infra.images.metadata.database
 
+import androidx.annotation.Keep
 import androidx.room.Entity
-import com.google.errorprone.annotations.Keep
 
 @Entity(
     tableName = "DbImageMetadata",

infra/images/src/main/java/com/simprints/infra/images/metadata/database/ImageMetadataDatabase.kt

@@ -1,10 +1,10 @@
 package com.simprints.infra.images.metadata.database
 
 import android.content.Context
+import androidx.annotation.Keep
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import com.google.errorprone.annotations.Keep
 
 @Database(
     entities = [DbImageMetadata::class],

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)
 }