From 54dbaf4c7aa3dc7f8926a2960f5d8171809d4c0a Mon Sep 17 00:00:00 2001
From: Daymon <daymxn@google.com>
Date: Mon, 14 Sep 2026 11:16:37 -0500
Subject: [PATCH 1/2] Create AppDistributionUnitSwift.xcscheme

---
 .../AppDistributionUnitSwift.xcscheme         | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 scripts/spm_test_schemes/AppDistributionUnitSwift.xcscheme

diff --git a/scripts/spm_test_schemes/AppDistributionUnitSwift.xcscheme b/scripts/spm_test_schemes/AppDistributionUnitSwift.xcscheme
new file mode 100644
index 00000000000..0053479fef4
--- /dev/null
+++ b/scripts/spm_test_schemes/AppDistributionUnitSwift.xcscheme
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1220"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AppDistributionUnitSwift"
+               BuildableName = "AppDistributionUnitSwift"
+               BlueprintName = "AppDistributionUnitSwift"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AppDistributionUnitSwift"
+               BuildableName = "AppDistributionUnitSwift"
+               BlueprintName = "AppDistributionUnitSwift"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

From 1c3554f4aa5668e6107f0e5a1d25c5cccf5c6881 Mon Sep 17 00:00:00 2001
From: Daymon <daymxn@google.com>
Date: Mon, 14 Sep 2026 11:16:40 -0500
Subject: [PATCH 2/2] Update sdk.appdistribution.yml

---
 .github/workflows/sdk.appdistribution.yml | 27 ++++-------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/sdk.appdistribution.yml b/.github/workflows/sdk.appdistribution.yml
index 357e04bfea8..ea0519d3ee0 100644
--- a/.github/workflows/sdk.appdistribution.yml
+++ b/.github/workflows/sdk.appdistribution.yml
@@ -10,10 +10,6 @@ on:
     - 'FirebaseAppDistribution**'
     - '.github/workflows/sdk.appdistribution.yml'
     - '.github/workflows/_spm.yml'
-    - '.github/workflows/_cocoapods.yml'
-    - '.github/workflows/_catalyst.yml'
-    - '.github/workflows/_cocoapods.cron.yml'
-    - 'Gemfile*'
   schedule:
     # Run every day at 2am (PDT) / 5am (EDT) - cron uses UTC times
     - cron: '0 9 * * *'
@@ -24,27 +20,12 @@ concurrency:
 
 jobs:
   spm:
+    strategy:
+      matrix:
+        target: [AppDistributionUnit, AppDistributionUnitSwift]
     uses: ./.github/workflows/_spm.yml
     with:
-      target: AppDistributionUnit
+      target: ${{ matrix.target }}
       platforms: iOS
 
-  catalyst:
-    uses: ./.github/workflows/_catalyst.yml
-    with:
-      product: FirebaseAppDistribution
-      target: FirebaseAppDistribution-Unit-unit
-
-  pod_lib_lint:
-    uses: ./.github/workflows/_cocoapods.yml
-    with:
-      product: FirebaseAppDistribution
-      platforms: iOS # App Distro only supports iOS.
 
-  appdistribution-cron-only:
-    needs: pod_lib_lint
-    uses: ./.github/workflows/_cocoapods.cron.yml
-    with:
-      product: FirebaseAppDistribution
-      platforms: '[ "ios" ]'
-      flags: '[ "--use-static-frameworks" ]'