From 695bce1234b737370495ae933be794c5df381340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniels=20=C5=A0atcs?= <dev@dshatz.com>
Date: Thu, 14 May 2026 11:42:35 +0000
Subject: [PATCH] Fix proguard keep rules not propagating since AGP 9.

---
 androidapp/build.gradle.kts              | 2 ++
 androidapp/rules.pro                     | 2 ++
 gradle/libs.versions.toml                | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 5 +++--
 pdfmp-compose/build.gradle.kts           | 2 +-
 pdfmp/build.gradle.kts                   | 7 +++++--
 6 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 androidapp/rules.pro

diff --git a/androidapp/build.gradle.kts b/androidapp/build.gradle.kts
index 71839f9..ecc16ff 100644
--- a/androidapp/build.gradle.kts
+++ b/androidapp/build.gradle.kts
@@ -17,7 +17,9 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = true
+            isShrinkResources = true
             signingConfig = buildTypes.getByName("debug").signingConfig
+            proguardFiles("rules.pro")
         }
     }
 }
diff --git a/androidapp/rules.pro b/androidapp/rules.pro
new file mode 100644
index 0000000..d614450
--- /dev/null
+++ b/androidapp/rules.pro
@@ -0,0 +1,2 @@
+
+-dontwarn androidx.test.platform.app.InstrumentationRegistry
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index aca4591..d41da0d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "2.3.0"
 jni = "1.1.0"
-agp = "9.0.1"
+agp = "9.2.1"
 filepicker = "0.12.0"
 publish = "0.35.0"
 skiko = "0.9.22.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 539e21b..1795eac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Sat Nov 15 15:30:12 EET 2025
+#Thu May 14 11:29:59 UTC 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/pdfmp-compose/build.gradle.kts b/pdfmp-compose/build.gradle.kts
index 959c97f..54f4059 100644
--- a/pdfmp-compose/build.gradle.kts
+++ b/pdfmp-compose/build.gradle.kts
@@ -31,7 +31,7 @@ kotlin {
         }
     }
     jvmToolchain(21)
-    androidLibrary {
+    android {
         namespace = "com.dshatz.pdfmp.compose"
         compileSdk = 36
         minSdk = 24
diff --git a/pdfmp/build.gradle.kts b/pdfmp/build.gradle.kts
index c284ab3..f1ce448 100644
--- a/pdfmp/build.gradle.kts
+++ b/pdfmp/build.gradle.kts
@@ -162,13 +162,16 @@ kotlin {
     }
     jvmToolchain(21)
     jvm()
-    androidLibrary {
+    android {
         namespace = "com.dshatz.pdfmp"
         compileSdk = 36
         minSdk = 24
 
         optimization {
-            this.consumerKeepRules.file(project.file("consumer-rules.pro"))
+            this.consumerKeepRules.apply {
+                file(project.file("consumer-rules.pro"))
+                publish = true
+            }
         }
 
         withDeviceTestBuilder {