From 13c08ddf57e7d57aeef275c3c8a2d77991218d13 Mon Sep 17 00:00:00 2001
From: Jagandeep Brar <me@jagandeepbrar.io>
Date: Wed, 16 Mar 2022 18:23:37 -0400
Subject: [PATCH] chore(ci): fix provisioning profiles installation order

---
 ios/fastlane/Fastfile   | 36 ++++++++++++++++++++++++++----------
 macos/fastlane/Fastfile | 10 +++++-----
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index e5b905d9..a0dbb563 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -12,6 +12,14 @@ platform :ios do
       timeout: 3600,
       lock_when_sleeps: false
     )
+
+    # Development
+    match(
+      type: "development",
+      readonly: is_ci,
+      keychain_name: ENV['MATCH_KEYCHAIN_NAME'],
+      keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
+    )
     
     # App Store Connect
     match(
@@ -20,14 +28,6 @@ platform :ios do
       keychain_name: ENV['MATCH_KEYCHAIN_NAME'],
       keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
     )
-
-    # Development
-    match(
-      type: "development",
-      readonly: false,
-      keychain_name: ENV['MATCH_KEYCHAIN_NAME'],
-      keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
-    )
   end
 
   desc "Destroy the LunaSea Keychain"
@@ -38,8 +38,24 @@ platform :ios do
   desc "Build App Package"
   lane :build do
     prepare_keychain
-    sh("flutter", "build", "ios", "--release", "--bundle-sksl-path=shaders/ios_sksl.json", "--no-codesign", "--build-number=#{build_number}")
-    build_ios_app(scheme: "Runner", workspace: "Runner.xcworkspace", export_method: "app-store")
+
+    sh(
+      "flutter", "build", "ios",
+      "--release",
+      "--bundle-sksl-path=shaders/ios_sksl.json",
+      "--no-codesign",
+      "--build-number=#{build_number}",
+    )
+    build_ios_app(
+      scheme: "Runner",
+      workspace: "Runner.xcworkspace",
+      export_method: "app-store",
+      export_options: {
+        "app.lunasea.lunasea" => "Provisioning Profile Name",
+        "app.lunasea.lunasea.ImageNotification" => "Provisioning Profile Name 2"
+      },
+    )
+
     destroy_keychain
   end
 
diff --git a/macos/fastlane/Fastfile b/macos/fastlane/Fastfile
index ae55f348..f8c2a1d0 100644
--- a/macos/fastlane/Fastfile
+++ b/macos/fastlane/Fastfile
@@ -13,10 +13,9 @@ platform :mac do
       lock_when_sleeps: false
     )
 
-    # App Store Connect
+    # Development
     match(
-      type: "appstore",
-      additional_cert_types: "mac_installer_distribution",
+      type: "development",
       readonly: is_ci,
       keychain_name: ENV["MATCH_KEYCHAIN_NAME"],
       keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
@@ -31,9 +30,10 @@ platform :mac do
     #   keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
     # )
 
-    # Development
+    # App Store Connect
     match(
-      type: "development",
+      type: "appstore",
+      additional_cert_types: "mac_installer_distribution",
       readonly: is_ci,
       keychain_name: ENV["MATCH_KEYCHAIN_NAME"],
       keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],