build: Add proguard to library modules

andresmr · andresmr · commit 2f935e2f8f49 · 2024-11-28T12:06:16.000+01:00
Signed-off-by: andresmr &lt;andres@dhis2.org&gt;
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,5 +1,4 @@
 import com.android.build.api.variant.impl.VariantOutputImpl
-import com.android.build.gradle.internal.scope.ProjectInfo.Companion.getBaseName
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
@@ -146,7 +145,7 @@ android {
             isShrinkResources = true
             isMinifyEnabled = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
             signingConfig = signingConfigs.getByName("release")
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -24,6 +24,26 @@
 # hide the original source file name.
 -renamesourcefileattribute SourceFile
 
+# Keep Hilt-generated components and entry points
+-keep class dagger.** { *; }
+-keep class hilt.** { *; }
+-keep class dagger.hilt.** { *; }
+-keep class androidx.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class dagger.internal.** { *; }
+-keep class dagger.multibindings.** { *; }
+-keep interface dagger.hilt.EntryPoint
+-keep interface dagger.hilt.InstallIn
+-keep @dagger.hilt.components.SingletonComponent class *
+# Keep DataBinding classes
+-keep class androidx.databinding.** { *; }
+-keep class **.databinding.** { *; }
+
+# Keep @Provides, @Binds, and other annotations
+-keepattributes *Annotation*
+-keepattributes InnerClasses
+-keepattributes EnclosingMethod
+
 -dontwarn autovalue.shaded.com.google$.errorprone.annotations.$CanIgnoreReturnValue
 -dontwarn autovalue.shaded.com.google$.errorprone.annotations.concurrent.$LazyInit
 -dontwarn com.android.org.conscrypt.SSLParametersImpl
diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts
@@ -31,7 +31,7 @@ android {
         getByName("debug") {
         }
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/commons/proguard-rules.pro b/commons/proguard-rules.pro
@@ -14,8 +14,16 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+# Keep ResourceManager
+-keep class org.dhis2.commons.resources.ResourceManager { *; }
+
+# Keep DispatcherProvider
+-keep class org.dhis2.commons.viewmodel.DispatcherProvider { *; }
+
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/compose-table/build.gradle.kts b/compose-table/build.gradle.kts
@@ -24,7 +24,7 @@ android {
         getByName("debug") {
         }
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/compose-table/proguard-rules.pro b/compose-table/proguard-rules.pro
@@ -14,8 +14,19 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+
+# Keep KeyboardInputType and its nested classes
+-keep class org.dhis2.composetable.model.KeyboardInputType { *; }
+-keep class org.dhis2.composetable.model.KeyboardInputType$* { *; }
+
+# Keep ValidationResult and its nested classes
+-keep class org.dhis2.composetable.model.ValidationResult { *; }
+-keep class org.dhis2.composetable.model.ValidationResult$* { *; }
+
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/dhis2-mobile-program-rules/build.gradle.kts b/dhis2-mobile-program-rules/build.gradle.kts
@@ -20,7 +20,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/dhis2-mobile-program-rules/proguard-rules.pro b/dhis2-mobile-program-rules/proguard-rules.pro
@@ -14,8 +14,8 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
diff --git a/dhis2_android_maps/build.gradle.kts b/dhis2_android_maps/build.gradle.kts
@@ -25,7 +25,7 @@ android {
         getByName("debug") {
         }
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/dhis2_android_maps/proguard-rules.pro b/dhis2_android_maps/proguard-rules.pro
@@ -14,8 +14,11 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+-dontwarn org.dhis2.commons.bindings.BindingsKt
+-dontwarn org.dhis2.commons.data.ProgramEventViewModel
diff --git a/dhis_android_analytics/build.gradle.kts b/dhis_android_analytics/build.gradle.kts
@@ -30,7 +30,7 @@ android {
         getByName("debug") {
         }
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/dhis_android_analytics/proguard-rules.pro b/dhis_android_analytics/proguard-rules.pro
@@ -14,8 +14,19 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+# Keep dhis2.org.analytics.charts.Charts
+-keep class dhis2.org.analytics.charts.Charts { *; }
+
+# Preserve attributes related to DataBinding
+-keepattributes *Annotation*
+
+-dontwarn org.dhis2.commons.bindings.CommonExtensionsKt
+-dontwarn org.dhis2.commons.filters.data.FilterBindingsKt
+-dontwarn org.dhis2.commons.resources.ColorType
+-dontwarn org.dhis2.commons.resources.ColorUtils
diff --git a/form/build.gradle.kts b/form/build.gradle.kts
@@ -29,7 +29,7 @@ android {
         getByName("debug") {
         }
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/form/proguard-rules.pro b/form/proguard-rules.pro
@@ -14,8 +14,10 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/stock-usecase/build.gradle.kts b/stock-usecase/build.gradle.kts
@@ -40,7 +40,7 @@ android {
 
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/stock-usecase/proguard-rules.pro b/stock-usecase/proguard-rules.pro
@@ -14,8 +14,75 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+# Keep Hilt-generated components and entry points
+-keep class dagger.** { *; }
+-keep class hilt.** { *; }
+-keep class dagger.hilt.** { *; }
+-keep class androidx.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class dagger.internal.** { *; }
+-keep class dagger.multibindings.** { *; }
+-keep interface dagger.hilt.EntryPoint
+-keep interface dagger.hilt.InstallIn
+-keep @dagger.hilt.components.SingletonComponent class *
+
+# Keep runtime annotations for Hilt and Dagger
+-keepattributes *Annotation*
+
+# Keep ViewModels to ensure Hilt can reference them
+-keep class  org.dhis2.android.rtsm.ui.managestock.ManageStockViewModel { *; }
+-keep class  org.dhis2.android.rtsm.ui.home.HomeViewModel { *; }
+-keep class  org.dhis2.android.rtsm.ui.base.BaseViewModel { *; }
+-keep class org.dhis2.android.rtsm.services.SpeechRecognitionManager { *; }
+-keep class org.dhis2.android.rtsm.services.rules.RuleValidationHelper { *; }
+-keep class org.dhis2.android.rtsm.services.StockManager { *; }
+-keep class org.dhis2.android.rtsm.services.MetadataManager { *; }
+-keep class org.dhis2.android.rtsm.services.scheduler.BaseSchedulerProvider { *; }
+-keep class org.dhis2.android.rtsm.services.StockTableDimensionStore { *; }
+-keep class org.dhis2.android.rtsm.ui.managestock.TableModelMapper { *; }
+
+-dontwarn dhis2.org.analytics.charts.ui.GroupAnalyticsFragment$Companion
+-dontwarn dhis2.org.analytics.charts.ui.GroupAnalyticsFragment
+-dontwarn java.lang.invoke.StringConcatFactory
+-dontwarn org.dhis2.commons.filters.FilterManager
+-dontwarn org.dhis2.commons.orgunitselector.OUTreeFragment$Builder
+-dontwarn org.dhis2.commons.orgunitselector.OUTreeFragment
+-dontwarn org.dhis2.commons.orgunitselector.OrgUnitSelectorScope$ProgramCaptureScope
+-dontwarn org.dhis2.commons.orgunitselector.OrgUnitSelectorScope
+-dontwarn org.dhis2.commons.sync.OnDismissListener
+-dontwarn org.dhis2.commons.sync.OnNoConnectionListener
+-dontwarn org.dhis2.commons.sync.OnSyncNavigationListener
+-dontwarn org.dhis2.commons.sync.SyncContext$TrackerProgram
+-dontwarn org.dhis2.commons.sync.SyncContext
+-dontwarn org.dhis2.commons.sync.SyncDialog
+-dontwarn org.dhis2.composetable.TableConfigurationState
+-dontwarn org.dhis2.composetable.TableScreenState
+-dontwarn org.dhis2.composetable.TableState
+-dontwarn org.dhis2.composetable.actions.TableResizeActions
+-dontwarn org.dhis2.composetable.actions.Validator
+-dontwarn org.dhis2.composetable.model.TableCell
+-dontwarn org.dhis2.composetable.model.TextInputModel
+-dontwarn org.dhis2.composetable.ui.DataSetTableScreenKt
+-dontwarn org.dhis2.composetable.ui.TableColors
+-dontwarn org.dhis2.composetable.ui.TableConfiguration
+-dontwarn org.dhis2.composetable.ui.TableDimensions
+-dontwarn org.dhis2.composetable.ui.TableThemeKt
+-dontwarn org.dhis2.composetable.ui.semantics.TableSemanticsKt
+-dontwarn org.dhis2.ui.buttons.FAButtonKt
+-dontwarn org.dhis2.ui.dialogs.bottomsheet.BottomSheetDialog
+-dontwarn org.dhis2.ui.dialogs.bottomsheet.BottomSheetDialogUiModel
+-dontwarn org.dhis2.ui.dialogs.bottomsheet.DialogButtonStyle$DiscardButton
+-dontwarn org.dhis2.ui.dialogs.bottomsheet.DialogButtonStyle$MainButton
+-dontwarn org.dhis2.ui.dialogs.bottomsheet.DialogButtonStyle
+-dontwarn org.dhis2.composetable.model.RowHeader
+-dontwarn org.dhis2.composetable.model.TableHeader
+-dontwarn org.dhis2.composetable.model.TableHeaderCell
+-dontwarn org.dhis2.composetable.model.TableHeaderRow
+-dontwarn org.dhis2.composetable.model.TableModel
+-dontwarn org.dhis2.composetable.model.TableRowModel
diff --git a/tracker/build.gradle.kts b/tracker/build.gradle.kts
@@ -19,7 +19,7 @@ android {
 
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/tracker/proguard-rules.pro b/tracker/proguard-rules.pro
@@ -14,8 +14,8 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
diff --git a/ui-components/build.gradle.kts b/ui-components/build.gradle.kts
@@ -26,11 +26,9 @@ android {
         getByName("debug") {
         }
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
-                getDefaultProguardFile(
-                    "proguard-android-optimize.txt"
-                ),
+                getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
         }
diff --git a/ui-components/proguard-rules.pro b/ui-components/proguard-rules.pro
@@ -14,8 +14,8 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
diff --git a/viewpagerdotsindicator/build.gradle.kts b/viewpagerdotsindicator/build.gradle.kts
@@ -9,11 +9,13 @@ android {
     defaultConfig {
         minSdk = libs.versions.minSdk.get().toInt()
         testOptions.targetSdk = libs.versions.sdk.get().toInt()
+
+        consumerProguardFiles("consumer-rules.pro")
     }
     namespace = "com.tbuonomo.viewpagerdotsindicator"
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ android {`
`31`	`31`	`getByName("debug") {`
`32`	`32`	`}`
`33`	`33`	`getByName("release") {`
`34`		`- isMinifyEnabled = false`
	`34`	`+ isMinifyEnabled = true`
`35`	`35`	`proguardFiles(`
`36`	`36`	`getDefaultProguardFile("proguard-android-optimize.txt"),`
`37`	`37`	`"proguard-rules.pro"`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ android {`
`24`	`24`	`getByName("debug") {`
`25`	`25`	`}`
`26`	`26`	`getByName("release") {`
`27`		`- isMinifyEnabled = false`
	`27`	`+ isMinifyEnabled = true`
`28`	`28`	`proguardFiles(`
`29`	`29`	`getDefaultProguardFile("proguard-android-optimize.txt"),`
`30`	`30`	`"proguard-rules.pro"`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ android {`
`25`	`25`	`getByName("debug") {`
`26`	`26`	`}`
`27`	`27`	`getByName("release") {`
`28`		`- isMinifyEnabled = false`
	`28`	`+ isMinifyEnabled = true`
`29`	`29`	`proguardFiles(`
`30`	`30`	`getDefaultProguardFile("proguard-android-optimize.txt"),`
`31`	`31`	`"proguard-rules.pro"`