From 0ed9b6633bda3742d474e72a72991d4bbb66bd6b Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 12 Mar 2026 22:46:01 -0500
Subject: [PATCH] build(ci): optimize release workflow and update Room
 configuration (#4775)

---
 .github/workflows/release.yml                        | 12 +++---------
 .../src/main/kotlin/AndroidRoomConventionPlugin.kt   |  1 -
 desktop/proguard-rules.pro                           |  9 ++++++++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5a7efc8e3..f23b63b34 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -150,8 +150,6 @@ jobs:
           bundler-cache: true
 
       - name: Export Full Library Licenses
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
         run: ./gradlew exportLibraryDefinitions -Pci=true
 
       - name: Build and Deploy Google Play to Internal Track with Fastlane
@@ -180,13 +178,13 @@ jobs:
           retention-days: 1
 
       - name: Attest Google AAB provenance
-        if: always()
+        if: success()
         uses: actions/attest-build-provenance@v4
         with:
           subject-path: app/build/outputs/bundle/googleRelease/app-google-release.aab
 
       - name: Attest Google APK provenance
-        if: always()
+        if: success()
         uses: actions/attest-build-provenance@v4
         with:
           subject-path: app/build/outputs/apk/google/release/*.apk
@@ -235,8 +233,6 @@ jobs:
           bundler-cache: true
 
       - name: Export Full Library Licenses
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
         run: ./gradlew exportLibraryDefinitions -Pci=true
 
       - name: Build F-Droid with Fastlane
@@ -257,7 +253,7 @@ jobs:
           retention-days: 1
 
       - name: Attest F-Droid APK provenance
-        if: always()
+        if: success()
         uses: actions/attest-build-provenance@v4
         with:
           subject-path: app/build/outputs/apk/fdroid/release/*.apk
@@ -296,8 +292,6 @@ jobs:
           build-scan-terms-of-use-agree: 'yes'
 
       - name: Export Full Library Licenses
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
         run: ./gradlew exportLibraryDefinitions -Pci=true
 
       - name: Package Native Distributions
diff --git a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
index b4603b2f3..1d5d77c42 100644
--- a/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt
@@ -55,7 +55,6 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
                     }
                 }
                 dependencies {
-                    "kspCommonMainMetadata"(roomCompiler)
                     "kspAndroid"(roomCompiler)
                 }
             }
diff --git a/desktop/proguard-rules.pro b/desktop/proguard-rules.pro
index 1a32ade42..7cfe4f918 100644
--- a/desktop/proguard-rules.pro
+++ b/desktop/proguard-rules.pro
@@ -1,4 +1,11 @@
 -dontwarn android.os.Parcel**
 -dontwarn android.os.Parcelable**
 -dontwarn com.squareup.wire.AndroidMessage**
--dontwarn io.ktor.**
\ No newline at end of file
+-dontwarn io.ktor.**
+
+# Suppress ProGuard notes about duplicate resource files (common in Compose Desktop)
+-dontnote **
+
+# Suppress specific reflection warnings that are safe to ignore
+-dontwarn java.lang.reflect.**
+-dontwarn sun.misc.Unsafe
\ No newline at end of file