From 32df44fbaac633186dfde50ba0a0b522fde169a1 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Wed, 20 May 2026 10:19:56 -0700
Subject: [PATCH] feat(flatpak): reconstruct standard maven filenames from
 local Gradle cache (#5538)

---
 gradle/flatpak.gradle.kts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gradle/flatpak.gradle.kts b/gradle/flatpak.gradle.kts
index f008ea4c4..6be63cb9e 100644
--- a/gradle/flatpak.gradle.kts
+++ b/gradle/flatpak.gradle.kts
@@ -48,7 +48,16 @@ abstract class GenerateFlatpakSourcesTask : DefaultTask() {
                             val version = parts[2]
 
                             val groupPath = group.replace('.', '/')
-                            val mavenPath = "$groupPath/$name/$version/$filename"
+
+                            // Reconstruct correct Maven filename if Gradle cache renamed it locally (e.g. animation.aar -> animation-android-1.10.0.aar)
+                            val standardPrefix = "$name-$version"
+                            val serverFilename = if (filename.startsWith(standardPrefix)) {
+                                filename
+                            } else {
+                                "$name-$version.$ext"
+                            }
+
+                            val mavenPath = "$groupPath/$name/$version/$serverFilename"
                             val dest = "offline-repository/$groupPath/$name/$version"
 
                             val sha256 = calculateSha256(file)
@@ -67,7 +76,7 @@ abstract class GenerateFlatpakSourcesTask : DefaultTask() {
                                     "url" to primaryUrl,
                                     "sha256" to sha256,
                                     "dest" to dest,
-                                    "dest-filename" to filename,
+                                    "dest-filename" to serverFilename,
                                     "mirror-urls" to mirrorUrls
                                 )
                             )