From 86f97639040ad1a820907cdfea87a12d0b7227bc Mon Sep 17 00:00:00 2001
From: Christoffer Adamsen <christofferqa@google.com>
Date: Fri, 23 May 2025 08:59:24 +0000
Subject: [PATCH] Add -repackageclasses to R8 configuration

---
 app/build.gradle.kts   | 3 ++-
 app/proguard-rules.pro | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 app/proguard-rules.pro

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6aec2d1bc..682fbc1b3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -45,7 +45,8 @@ android {
         release {
             isMinifyEnabled = true
             applicationIdSuffix = NiaBuildType.RELEASE.applicationIdSuffix
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"),
+                          "proguard-rules.pro")
 
             // To publish on the Play store a private signing key is required, but to allow anyone
             // who clones the code to sign and run the release variant, use the debug signing key.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 000000000..24a0b4a16
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,2 @@
+# Repackage classes into the default package to reduce the size of descriptors.
+-repackageclasses