Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add mergeable libraries support to dynamic libraries #4367

Closed
wants to merge 17 commits into from
Closed

Add mergeable libraries support to dynamic libraries #4367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bc7a2c8
Support `mergable-library` for dynamic frameworks
denrase Sep 24, 2024
96d883b
Remove make_mergable linker flag for watchos and wachsimulator SDKs
denrase Sep 24, 2024
a881cac
add cl entry
denrase Sep 24, 2024
9b46b45
Merge branch 'main' into feat/enable-mergable-library
denrase Sep 24, 2024
dd66b85
format cl
denrase Sep 24, 2024
31c3d72
Enable in samples
denrase Sep 24, 2024
2e172fb
Don’t embed Sentry.framework
denrase Sep 24, 2024
60eafca
Fix shellcheck issue
denrase Sep 24, 2024
4708e81
remove MERGEABLE_LIBRARY in project file for watchos sdks
denrase Sep 25, 2024
5e21fe9
set make_mergeable option in SDK.xcconfig
denrase Sep 30, 2024
2882456
remove OTHER_LDFLAGS from build script
denrase Sep 30, 2024
3dd9063
Merge branch 'main' into feat/enable-mergable-library
denrase Sep 30, 2024
da1ffed
format
denrase Sep 30, 2024
32bc467
Make release builds with Xcode 15.2
denrase Sep 30, 2024
a72bffa
use 15.2 for ios/macos build
denrase Sep 30, 2024
ef19c66
build with xcdeo 15.2
denrase Sep 30, 2024
9d7c072
tst higher macos/xcode for fastlane sample release build
denrase Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmarking.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- run: ./scripts/ci-select-xcode.sh
- run: ./scripts/ci-select-xcode.sh 15.2
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
steps:
- name: Git checkout
uses: actions/checkout@v4
- run: ./scripts/ci-select-xcode.sh
- run: ./scripts/ci-select-xcode.sh 15.2
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
# With this we catch potential issues already in the PR.
ios-swift-release:
name: Release Build of iOS Swift
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- run: ./scripts/ci-select-xcode.sh
- run: ./scripts/ci-select-xcode.sh 16.0
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- run: ./scripts/ci-select-xcode.sh
- run: ./scripts/ci-select-xcode.sh 15.2

# Disable code signing. We just want to make sure these compile.
- run: >-
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Features

- Add mergeable libraries support to dynamic libraries (#4367) This is not supported for watchOS targets.
- Added breadcrumb.origin private field (#4358)
- Custom redact modifier for SwiftUI (#4362)

Expand Down
6 changes: 4 additions & 2 deletions Samples/iOS-ObjectiveC/iOS-ObjectiveC.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
630853492440C46E00DDE4CE /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6308533B2440C45500DDE4CE /* Sentry.framework */; };
6308534A2440C46E00DDE4CE /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6308533B2440C45500DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
637AFDCB243B036B0034958B /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 637AFDCA243B036B0034958B /* AppDelegate.m */; };
637AFDD1243B036B0034958B /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 637AFDD0243B036B0034958B /* ViewController.m */; };
637AFDD4243B036B0034958B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 637AFDD2243B036B0034958B /* Main.storyboard */; };
Expand Down Expand Up @@ -87,7 +86,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
6308534A2440C46E00DDE4CE /* Sentry.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -587,6 +585,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-ObjectiveC";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -610,6 +609,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-ObjectiveC";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -734,6 +734,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-ObjectiveC";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -835,6 +836,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-ObjectiveC";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
43 changes: 31 additions & 12 deletions Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,14 @@
84FB812B284001B800F3A94A /* SentryBenchmarking.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84FB8129284001B800F3A94A /* SentryBenchmarking.mm */; };
8E8C57AF25EF16E6001CEEFA /* TraceTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E8C57AE25EF16E6001CEEFA /* TraceTestViewController.swift */; };
924857562C89A86300774AC3 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924857552C89A85F00774AC3 /* MainViewController.swift */; };
926C05D02CA31AB200E9C17C /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; };
926C05D12CA31AB200E9C17C /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B70038852BB33E7700065A38 /* ReplaceContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B70038842BB33E7700065A38 /* ReplaceContentViewController.swift */; };
D80D021329EE93630084393D /* ErrorsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80D021229EE93630084393D /* ErrorsViewController.swift */; };
D80D021A29EE936F0084393D /* ExtraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80D021929EE936F0084393D /* ExtraViewController.swift */; };
D80D021B29EE9E3D0084393D /* ErrorsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80D021229EE93630084393D /* ErrorsViewController.swift */; };
D80D021C29EE9E400084393D /* ExtraViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D80D021929EE936F0084393D /* ExtraViewController.swift */; };
D8105B61297E824C00299F03 /* SentrySwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8105B5C297E792200299F03 /* SentrySwiftUI.framework */; };
D8105B62297E824C00299F03 /* SentrySwiftUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8105B5C297E792200299F03 /* SentrySwiftUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D8269A3C274C095E00BD5BD5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8269A3B274C095E00BD5BD5 /* AppDelegate.swift */; };
D8269A3E274C095E00BD5BD5 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8269A3D274C095E00BD5BD5 /* SceneDelegate.swift */; };
D8269A43274C095F00BD5BD5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D8269A41274C095F00BD5BD5 /* Main.storyboard */; };
Expand All @@ -70,8 +71,6 @@
D8269A57274C0FA100BD5BD5 /* NibViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D890CD3E26CEE31B001246CF /* NibViewController.swift */; };
D8269A58274C0FC700BD5BD5 /* TransactionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 637AFDAD243B02760034958B /* TransactionsViewController.swift */; };
D8269A59274C100300BD5BD5 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; };
D8269A5A274C100300BD5BD5 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D83A30D8279F159D00372D0A /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D83A30DC279F16BA00372D0A /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
D83A30E1279F1F5C00372D0A /* fatal-error-binary-images-message2.json in Resources */ = {isa = PBXBuildFile; fileRef = D83A30DF279F1F5C00372D0A /* fatal-error-binary-images-message2.json */; };
D840D523273A07F400CDF142 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D840D522273A07F400CDF142 /* AppDelegate.swift */; };
Expand Down Expand Up @@ -100,7 +99,6 @@
D8AE48C92C57DC2F0092A2A6 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AE48C82C57DC2F0092A2A6 /* WebViewController.swift */; };
D8AE48CF2C57E0BD0092A2A6 /* WebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AE48C82C57DC2F0092A2A6 /* WebViewController.swift */; };
D8B56CF0273A8D97004DF238 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; };
D8B56CF1273A8D97004DF238 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D8C33E1F29FBB1F70071B75A /* UIEventBreadcrumbsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8C33E1E29FBB1F70071B75A /* UIEventBreadcrumbsController.swift */; };
D8C33E2629FBB8D90071B75A /* UIEventBreadcrumbTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8C33E2529FBB8D90071B75A /* UIEventBreadcrumbTests.swift */; };
D8D7BB4A2750067900044146 /* UIAssert.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8D7BB492750067900044146 /* UIAssert.swift */; };
Expand Down Expand Up @@ -223,7 +221,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
D83A30D8279F159D00372D0A /* Sentry.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -250,14 +247,23 @@
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
926C05D22CA31AB200E9C17C /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
926C05D12CA31AB200E9C17C /* Sentry.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
D8269A5B274C100300BD5BD5 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
D8269A5A274C100300BD5BD5 /* Sentry.framework in Embed Frameworks */,
D8105B62297E824C00299F03 /* SentrySwiftUI.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -279,7 +285,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
D8B56CF1273A8D97004DF238 /* Sentry.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -427,6 +432,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
926C05D02CA31AB200E9C17C /* Sentry.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -779,6 +785,7 @@
D85DAA45274C244F004DF43C /* Sources */,
D85DAA46274C244F004DF43C /* Frameworks */,
D85DAA47274C244F004DF43C /* Resources */,
926C05D22CA31AB200E9C17C /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -1417,7 +1424,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.37.0-beta.1;
MARKETING_VERSION = "8.37.0-beta.1";
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
Expand Down Expand Up @@ -1446,7 +1454,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.37.0-beta.1;
MARKETING_VERSION = "8.37.0-beta.1";
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift";
Expand Down Expand Up @@ -1633,6 +1642,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 7.27.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
Expand Down Expand Up @@ -1718,6 +1728,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 7.27.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
Expand Down Expand Up @@ -1749,6 +1760,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.Sentry.iOS13-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand Down Expand Up @@ -1858,6 +1870,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 7.27.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift";
Expand Down Expand Up @@ -1943,6 +1956,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 7.27.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
Expand Down Expand Up @@ -1974,6 +1988,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.Sentry.iOS13-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand Down Expand Up @@ -2028,6 +2043,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.Sentry.iOS13-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand Down Expand Up @@ -2060,6 +2076,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.Sentry.iOS13-Swift";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
Expand Down Expand Up @@ -2095,7 +2112,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.37.0-beta.1;
MARKETING_VERSION = "8.37.0-beta.1";
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip";
Expand Down Expand Up @@ -2130,7 +2148,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 8.37.0-beta.1;
MARKETING_VERSION = "8.37.0-beta.1";
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip";
Expand Down
12 changes: 6 additions & 6 deletions Samples/iOS-SwiftUI/iOS-SwiftUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@
7BB6224F26A56C4E00D0E75E /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BB6224E26A56C4E00D0E75E /* ContentView.swift */; };
7BB6225126A56C5000D0E75E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7BB6225026A56C5000D0E75E /* Assets.xcassets */; };
7BB6225426A56C5000D0E75E /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7BB6225326A56C5000D0E75E /* Preview Assets.xcassets */; };
7BB6225E26A56CB600D0E75E /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7BB6225C26A56CB600D0E75E /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
84BA72B52C9369C80045B828 /* GitInjections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84BA72B32C9369C80045B828 /* GitInjections.swift */; };
84D4FEB528ECD53500EDAAFE /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D4FEB228ECD52E00EDAAFE /* Sentry.framework */; };
926C05CE2CA31A4400E9C17C /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A94157E28F6B893006A5DD1 /* Sentry.framework */; };
D8199DCD29376FD90074249E /* SentrySwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8BBD38B2901AE400011F850 /* SentrySwiftUI.framework */; };
D8199DCE29376FD90074249E /* SentrySwiftUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8BBD38B2901AE400011F850 /* SentrySwiftUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
D832FAF02982A908007A9A5F /* FormScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D832FAEF2982A908007A9A5F /* FormScreen.swift */; };
D85388D12980222500B63908 /* UIKitScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D85388D02980222500B63908 /* UIKitScreen.swift */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -124,8 +122,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
7BB6225E26A56CB600D0E75E /* Sentry.framework in Embed Frameworks */,
D8199DCE29376FD90074249E /* SentrySwiftUI.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -173,8 +169,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
84D4FEB528ECD53500EDAAFE /* Sentry.framework in Frameworks */,
D8199DCD29376FD90074249E /* SentrySwiftUI.framework in Frameworks */,
926C05CE2CA31A4400E9C17C /* Sentry.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -733,6 +729,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-SwiftUI";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -760,6 +757,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-SwiftUI";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -844,6 +842,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-SwiftUI";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -947,6 +946,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-SwiftUI";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
4 changes: 2 additions & 2 deletions Samples/iOS15-SwiftUI/iOS15-SwiftUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
7B5166502758C6F400C0A720 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B51664F2758C6F400C0A720 /* Assets.xcassets */; };
7B5166532758C6F400C0A720 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7B5166522758C6F400C0A720 /* Preview Assets.xcassets */; };
7B5166772758C72600C0A720 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5166762758C72600C0A720 /* Sentry.framework */; };
7B5166782758C72600C0A720 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5166762758C72600C0A720 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -22,7 +21,6 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
7B5166782758C72600C0A720 /* Sentry.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -310,6 +308,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS15-SwiftUI";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -339,6 +338,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
MERGED_BINARY_TYPE = automatic;
PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS15-SwiftUI";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
Loading
Loading