From d22ac4bb036f0b57ada1ee848a3ec16b00b37ea3 Mon Sep 17 00:00:00 2001 From: melekr Date: Mon, 12 Aug 2024 11:56:56 -0400 Subject: [PATCH 1/7] Codesign xcframework --- .github/workflows/deploy.yml | 6 ++++++ scripts/deploy.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 929b9b36..6071a817 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -105,6 +105,12 @@ jobs: run: sh scripts/xcframeworkgen.sh env: BACKTRACE_VERSION: ${{ github.ref_name }} + + - name: Codesign frameworks + env: + DISTRIBUTION_IDENTITY: ${{ secrets.DISTRIBUTION_IDENTITY }} + run: + codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" Backtrace.xcframework - name: Tar files to preserve file permissions run: tar -cvzf Archive_XCFrameworks_${{ github.ref_name }}.tar.gz frameworks/ diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 5e58544a..582a8f97 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -6,4 +6,4 @@ set -o xtrace # to trace what gets executed. Useful for debugging # This script requires the `COCOAPODS_TRUNK_TOKEN` env var to be set. # See more: https://fuller.li/posts/automated-cocoapods-releases-with-ci/. -pod trunk push Backtrace.podspec --allow-warnings +#pod trunk push Backtrace.podspec --allow-warnings From 2f87ad288516be71f1f0d33d6908fb5f959c8940 Mon Sep 17 00:00:00 2001 From: melekr Date: Mon, 12 Aug 2024 12:00:43 -0400 Subject: [PATCH 2/7] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6071a817..73c592f7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -110,7 +110,7 @@ jobs: env: DISTRIBUTION_IDENTITY: ${{ secrets.DISTRIBUTION_IDENTITY }} run: - codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" Backtrace.xcframework + codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" frameworks/Backtrace.xcframework - name: Tar files to preserve file permissions run: tar -cvzf Archive_XCFrameworks_${{ github.ref_name }}.tar.gz frameworks/ From d7aeb7144dd5859e454b95dc07d2cf360176c331 Mon Sep 17 00:00:00 2001 From: melekr Date: Mon, 12 Aug 2024 14:58:11 -0400 Subject: [PATCH 3/7] Set MARKETING_VERSION --- Backtrace.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Backtrace.xcodeproj/project.pbxproj b/Backtrace.xcodeproj/project.pbxproj index 8ecfe866..48b43a1a 100644 --- a/Backtrace.xcodeproj/project.pbxproj +++ b/Backtrace.xcodeproj/project.pbxproj @@ -3406,6 +3406,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.13; + MARKETING_VERSION = 2.0.5; STRIP_STYLE = debugging; STRIP_SWIFT_SYMBOLS = NO; SWIFT_VERSION = 5.0; @@ -3419,6 +3420,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; MACOSX_DEPLOYMENT_TARGET = 10.13; + MARKETING_VERSION = 2.0.5; STRIP_STYLE = debugging; STRIP_SWIFT_SYMBOLS = NO; SWIFT_VERSION = 5.0; From c6f33aa4647f066f158c9b5a88fce11e01fe3b54 Mon Sep 17 00:00:00 2001 From: melekr Date: Mon, 12 Aug 2024 14:59:47 -0400 Subject: [PATCH 4/7] Update deploy.yml --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 73c592f7..1e2e47e6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -110,7 +110,8 @@ jobs: env: DISTRIBUTION_IDENTITY: ${{ secrets.DISTRIBUTION_IDENTITY }} run: - codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" frameworks/Backtrace.xcframework + codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" frameworks/Backtrace.xcframework + codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" frameworks/PLCrashReporter/CrashReporter.xcframework - name: Tar files to preserve file permissions run: tar -cvzf Archive_XCFrameworks_${{ github.ref_name }}.tar.gz frameworks/ From 6c3e337ec0a69a3aad0f8095e48e18541036f591 Mon Sep 17 00:00:00 2001 From: melekr Date: Mon, 12 Aug 2024 15:13:20 -0400 Subject: [PATCH 5/7] Update Example-iOS entitlements path --- Backtrace.xcodeproj/project.pbxproj | 6 +++--- .../Example-iOS/Example-iOS.entitlements | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename Example-iOS.entitlements => Examples/Example-iOS/Example-iOS.entitlements (100%) diff --git a/Backtrace.xcodeproj/project.pbxproj b/Backtrace.xcodeproj/project.pbxproj index 48b43a1a..75484a3e 100644 --- a/Backtrace.xcodeproj/project.pbxproj +++ b/Backtrace.xcodeproj/project.pbxproj @@ -1041,7 +1041,6 @@ F2C2FA4421BBD23B00934744 = { isa = PBXGroup; children = ( - 2050DB9C2C61A09D00C6CCA9 /* Example-iOS.entitlements */, F254690423E6FB750063E4B9 /* Examples */, F266B85321C77D5D00D14417 /* Tests */, F2C2FA8421BBD2AE00934744 /* Sources */, @@ -1131,6 +1130,7 @@ F2D8BE0521BC065E007CFEFA /* Example-iOS */ = { isa = PBXGroup; children = ( + 2050DB9C2C61A09D00C6CCA9 /* Example-iOS.entitlements */, F2D8BE0621BC065E007CFEFA /* AppDelegate.swift */, F2D8BE0821BC065E007CFEFA /* ViewController.swift */, F2D8BE0A21BC065E007CFEFA /* Main.storyboard */, @@ -3800,7 +3800,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_ENTITLEMENTS = "Example-iOS.entitlements"; + CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Examples/Example-iOS/Example-iOS.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; @@ -3884,7 +3884,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_ENTITLEMENTS = "Example-iOS.entitlements"; + CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Examples/Example-iOS/Example-iOS.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; diff --git a/Example-iOS.entitlements b/Examples/Example-iOS/Example-iOS.entitlements similarity index 100% rename from Example-iOS.entitlements rename to Examples/Example-iOS/Example-iOS.entitlements From d57fd71fb463902555606d5b723f210aa14fcc48 Mon Sep 17 00:00:00 2001 From: melekr Date: Mon, 12 Aug 2024 15:26:27 -0400 Subject: [PATCH 6/7] Omit deep signing flag --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1e2e47e6..989338ca 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -109,9 +109,9 @@ jobs: - name: Codesign frameworks env: DISTRIBUTION_IDENTITY: ${{ secrets.DISTRIBUTION_IDENTITY }} - run: - codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" frameworks/Backtrace.xcframework - codesign --force --timestamp --deep --sign "$DISTRIBUTION_IDENTITY" frameworks/PLCrashReporter/CrashReporter.xcframework + run: | + codesign --force --timestamp --sign "$DISTRIBUTION_IDENTITY" frameworks/Backtrace.xcframework + codesign --force --timestamp --sign "$DISTRIBUTION_IDENTITY" frameworks/PLCrashReporter/CrashReporter.xcframework - name: Tar files to preserve file permissions run: tar -cvzf Archive_XCFrameworks_${{ github.ref_name }}.tar.gz frameworks/ From 0f25408ca6849ce89e573f2786651db588c6c4a4 Mon Sep 17 00:00:00 2001 From: melekr Date: Mon, 12 Aug 2024 18:01:21 -0400 Subject: [PATCH 7/7] Restore pod trunk --- scripts/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 582a8f97..5e58544a 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -6,4 +6,4 @@ set -o xtrace # to trace what gets executed. Useful for debugging # This script requires the `COCOAPODS_TRUNK_TOKEN` env var to be set. # See more: https://fuller.li/posts/automated-cocoapods-releases-with-ci/. -#pod trunk push Backtrace.podspec --allow-warnings +pod trunk push Backtrace.podspec --allow-warnings