From 47a6914062caa39101505bfeeddc26018f15548f Mon Sep 17 00:00:00 2001
From: Conrad Kramer <conrad@conradkramer.com>
Date: Sun, 10 Sep 2023 23:06:55 -0700
Subject: [PATCH] Skip plugin validation when building for release

This is needed now that SwiftLint is installed as a plugin.
---
 .github/actions/archive/action.yml            |  3 ++-
 .github/actions/build-for-testing/action.yml  |  2 +-
 .github/workflows/release-apple.yml           | 24 ++++++++++++++-----
 .../xcshareddata/swiftpm/Package.resolved     | 12 +++++-----
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/.github/actions/archive/action.yml b/.github/actions/archive/action.yml
index c34bd3ce..4fd15b02 100644
--- a/.github/actions/archive/action.yml
+++ b/.github/actions/archive/action.yml
@@ -26,13 +26,14 @@ runs:
     run: |
       echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
 
-      xcodebuild archive \
+      xcodebuild clean archive \
         -allowProvisioningUpdates \
         -allowProvisioningDeviceRegistration \
         -authenticationKeyID ${{ inputs.app-store-key-id }} \
         -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
         -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
         -onlyUsePackageVersionsFromResolvedFile \
+        -skipPackagePluginValidation \
         -scheme '${{ inputs.scheme }}' \
         -destination '${{ inputs.destination }}' \
         -archivePath '${{ inputs.archive-path }}' \
diff --git a/.github/actions/build-for-testing/action.yml b/.github/actions/build-for-testing/action.yml
index 2fd0d42a..69d10683 100644
--- a/.github/actions/build-for-testing/action.yml
+++ b/.github/actions/build-for-testing/action.yml
@@ -23,7 +23,7 @@ runs:
     run: |
       echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
 
-      xcodebuild clean build-for-testing \
+      xcodebuild build-for-testing \
         -allowProvisioningUpdates \
         -allowProvisioningDeviceRegistration \
         -authenticationKeyID ${{ inputs.app-store-key-id }} \
diff --git a/.github/workflows/release-apple.yml b/.github/workflows/release-apple.yml
index 757cf170..b4866306 100644
--- a/.github/workflows/release-apple.yml
+++ b/.github/workflows/release-apple.yml
@@ -12,14 +12,16 @@ jobs:
       matrix:
         configuration:
         - scheme: App
-          destination: generic/platform=iOS
+          build-destination: generic/platform=iOS
           platform: iOS
           method: ad-hoc
+          export-destination: export
           artifact-file: Apple/Release/Wallet.ipa
         - scheme: App (macOS)
-          destination: generic/platform=macOS
+          build-destination: generic/platform=macOS
           platform: macOS
-          method: mac-application
+          method: developer-id
+          export-destination: upload
           artifact-file: Apple/Wallet.app.aar
     env:
       DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
@@ -45,8 +47,8 @@ jobs:
     - name: Import Certificate
       uses: ./.github/actions/import-cert
       with:
-        certificate: ${{ secrets.DEVELOPER_CERT }}
-        password: ${{ secrets.DEVELOPER_CERT_PASSWORD }}
+        certificate: ${{ secrets.DEVELOPER_ID_CERT }}
+        password: ${{ secrets.DEVELOPER_ID_CERT_PASSWORD }}
     - name: Build External Libraries
       shell: bash
       run: External/build-darwin.sh ${{ matrix.configuration['sdk-name'] }}
@@ -54,11 +56,21 @@ jobs:
       uses: ./.github/actions/archive
       with:
         scheme: ${{ matrix.configuration['scheme'] }}
-        destination: ${{ matrix.configuration['destination'] }}
+        destination: ${{ matrix.configuration['build-destination'] }}
         app-store-key: ${{ secrets.APPSTORE_KEY }}
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
         archive-path: Wallet.xcarchive
+    - name: Export
+      uses: ./.github/actions/export
+      with:
+        method: ${{ matrix.configuration['method'] }}
+        destination: ${{ matrix.configuration['export-destination'] }}
+        app-store-key: ${{ secrets.APPSTORE_KEY }}
+        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
+        archive-path: Wallet.xcarchive
+        export-path: Release
     - name: Notarize
       if: ${{ matrix.configuration['platform'] == 'macOS' }}
       uses: ./.github/actions/notarize
diff --git a/Apple/Wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Apple/Wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 03e997f3..09753d9f 100644
--- a/Apple/Wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Apple/Wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -49,8 +49,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
-        "revision" : "fee6933f37fde9a5e12a1e4aeaa93fe60116ff2a",
-        "version" : "1.2.2"
+        "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
+        "version" : "1.2.3"
       }
     },
     {
@@ -58,8 +58,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-syntax.git",
       "state" : {
-        "revision" : "27cd6190ce0628847a3f8050794d6e627ad79c08",
-        "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-05-02-a"
+        "revision" : "59ed009d2c4a5a6b78f75a25679b6417ac040dcf",
+        "version" : "509.0.0-swift-DEVELOPMENT-SNAPSHOT-2023-07-04-a"
       }
     },
     {
@@ -67,8 +67,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/realm/SwiftLint.git",
       "state" : {
-        "revision" : "34f5ffa7f706ed2dfe11bd300e5197e8878e3856",
-        "version" : "0.52.2"
+        "revision" : "9eaecbedce469a51bd8487effbd4ab46ec8384ae",
+        "version" : "0.52.4"
       }
     },
     {