From d9fbf63643c88296341d5734ea9c01ce75c8204d Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 10:09:20 +0100 Subject: [PATCH 01/28] fix: Concurrency crash for Swift 6 --- CHANGELOG.md | 4 ++++ Sources/Sentry/Public/SentryOptions.h | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4163298a63..c950938a5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - Add extra logs for UIViewControllerSwizzling (#4511) +### Fixes + +- Concurrency crash with Swift 6 () + ## 8.40.0 ## Feature diff --git a/Sources/Sentry/Public/SentryOptions.h b/Sources/Sentry/Public/SentryOptions.h index 0a053c418e..bdfc576ff3 100644 --- a/Sources/Sentry/Public/SentryOptions.h +++ b/Sources/Sentry/Public/SentryOptions.h @@ -142,25 +142,25 @@ NS_SWIFT_NAME(Options) /** * This block can be used to modify the event before it will be serialized and sent. */ -@property (nullable, nonatomic, copy) SentryBeforeSendEventCallback beforeSend; +@property (nullable, nonatomic, copy) SentryBeforeSendEventCallback beforeSend NS_SWIFT_SENDABLE; /** * Use this callback to drop or modify a span before the SDK sends it to Sentry. Return @c nil to * drop the span. */ -@property (nullable, nonatomic, copy) SentryBeforeSendSpanCallback beforeSendSpan; +@property (nullable, nonatomic, copy) SentryBeforeSendSpanCallback beforeSendSpan NS_SWIFT_SENDABLE; /** * This block can be used to modify the event before it will be serialized and sent. */ -@property (nullable, nonatomic, copy) SentryBeforeBreadcrumbCallback beforeBreadcrumb; +@property (nullable, nonatomic, copy) SentryBeforeBreadcrumbCallback beforeBreadcrumb NS_SWIFT_SENDABLE; /** * You can use this callback to decide if the SDK should capture a screenshot or not. Return @c true * if the SDK should capture a screenshot, return @c false if not. This callback doesn't work for * crashes. */ -@property (nullable, nonatomic, copy) SentryBeforeCaptureScreenshotCallback beforeCaptureScreenshot; +@property (nullable, nonatomic, copy) SentryBeforeCaptureScreenshotCallback beforeCaptureScreenshot NS_SWIFT_SENDABLE; /** * You can use this callback to decide if the SDK should capture a view hierarchy or not. Return @c @@ -168,7 +168,7 @@ NS_SWIFT_NAME(Options) * work for crashes. */ @property (nullable, nonatomic, copy) - SentryBeforeCaptureScreenshotCallback beforeCaptureViewHierarchy; + SentryBeforeCaptureScreenshotCallback beforeCaptureViewHierarchy NS_SWIFT_SENDABLE; /** * A block called shortly after the initialization of the SDK when the last program execution @@ -180,7 +180,7 @@ NS_SWIFT_NAME(Options) * @warning It is not guaranteed that this is called on the main thread. * @note Crash reporting is automatically disabled if a debugger is attached. */ -@property (nullable, nonatomic, copy) SentryOnCrashedLastRunCallback onCrashedLastRun; +@property (nullable, nonatomic, copy) SentryOnCrashedLastRunCallback onCrashedLastRun NS_SWIFT_SENDABLE; /** * Array of integrations to install. @@ -400,7 +400,7 @@ NS_SWIFT_NAME(Options) * with @c SentrySamplingContext.forNextAppLaunch set to @c YES, and the result will be persisted to * disk for use on the next app launch. */ -@property (nullable, nonatomic) SentryTracesSamplerCallback tracesSampler; +@property (nullable, nonatomic) SentryTracesSamplerCallback tracesSampler NS_SWIFT_SENDABLE; /** * If tracing is enabled or not. @@ -537,7 +537,7 @@ NS_SWIFT_NAME(Options) * disk for use on the next app launch. * @note Profiling is automatically disabled if a thread sanitizer is attached. */ -@property (nullable, nonatomic) SentryTracesSamplerCallback profilesSampler; +@property (nullable, nonatomic) SentryTracesSamplerCallback profilesSampler NS_SWIFT_SENDABLE; /** * If profiling should be enabled or not. From 68f235e6a944cd975996c9b0437e5c220e570ca0 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 10:13:58 +0100 Subject: [PATCH 02/28] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c950938a5c..0f9a711446 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Fixes -- Concurrency crash with Swift 6 () +- Concurrency crash with Swift 6 (#4512) ## 8.40.0 From 34355c7cc71426c961639ea5d4a784460c466d05 Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Thu, 7 Nov 2024 09:14:15 +0000 Subject: [PATCH 03/28] Format code --- Sources/Sentry/Public/SentryOptions.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Sources/Sentry/Public/SentryOptions.h b/Sources/Sentry/Public/SentryOptions.h index bdfc576ff3..3313d338c6 100644 --- a/Sources/Sentry/Public/SentryOptions.h +++ b/Sources/Sentry/Public/SentryOptions.h @@ -153,14 +153,16 @@ NS_SWIFT_NAME(Options) /** * This block can be used to modify the event before it will be serialized and sent. */ -@property (nullable, nonatomic, copy) SentryBeforeBreadcrumbCallback beforeBreadcrumb NS_SWIFT_SENDABLE; +@property (nullable, nonatomic, copy) + SentryBeforeBreadcrumbCallback beforeBreadcrumb NS_SWIFT_SENDABLE; /** * You can use this callback to decide if the SDK should capture a screenshot or not. Return @c true * if the SDK should capture a screenshot, return @c false if not. This callback doesn't work for * crashes. */ -@property (nullable, nonatomic, copy) SentryBeforeCaptureScreenshotCallback beforeCaptureScreenshot NS_SWIFT_SENDABLE; +@property (nullable, nonatomic, copy) + SentryBeforeCaptureScreenshotCallback beforeCaptureScreenshot NS_SWIFT_SENDABLE; /** * You can use this callback to decide if the SDK should capture a view hierarchy or not. Return @c @@ -180,7 +182,8 @@ NS_SWIFT_NAME(Options) * @warning It is not guaranteed that this is called on the main thread. * @note Crash reporting is automatically disabled if a debugger is attached. */ -@property (nullable, nonatomic, copy) SentryOnCrashedLastRunCallback onCrashedLastRun NS_SWIFT_SENDABLE; +@property (nullable, nonatomic, copy) + SentryOnCrashedLastRunCallback onCrashedLastRun NS_SWIFT_SENDABLE; /** * Array of integrations to install. From 897919ae317d6a2726d286e7e5455e5b8286333b Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 10:54:35 +0100 Subject: [PATCH 04/28] test --- .github/workflows/ui-tests.yml | 19 + .../iOS-Swift.xcodeproj/project.pbxproj | 605 +++++++++++++----- .../xcschemes/iOS-Swift6.xcscheme | 102 +++ .../iOS-Swift/iOS-Swift6/AppDelegate.swift | 50 ++ .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 35 + .../iOS-Swift6/Assets.xcassets/Contents.json | 6 + .../Base.lproj/LaunchScreen.storyboard | 25 + .../iOS-Swift6/Base.lproj/Main.storyboard | 47 ++ Samples/iOS-Swift/iOS-Swift6/Info.plist | 25 + .../iOS-Swift/iOS-Swift6/SceneDelegate.swift | 25 + .../iOS-Swift/iOS-Swift6/ViewController.swift | 11 + .../iOS-Swift6UITests/iOS_Swift6UITests.swift | 16 + fastlane/Fastfile | 8 + 14 files changed, 814 insertions(+), 171 deletions(-) create mode 100644 Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme create mode 100644 Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift create mode 100644 Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/Contents.json create mode 100644 Samples/iOS-Swift/iOS-Swift6/Base.lproj/LaunchScreen.storyboard create mode 100644 Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard create mode 100644 Samples/iOS-Swift/iOS-Swift6/Info.plist create mode 100644 Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift create mode 100644 Samples/iOS-Swift/iOS-Swift6/ViewController.swift create mode 100644 Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index b6a92863e6..c6e3a739f6 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -110,3 +110,22 @@ jobs: path: | ~/Library/Logs/scan/*.log ./fastlane/test_output/** + + ui-tests-swift6: + name: UI Tests for iOS-Swift6 Simulator + runs-on: macos-14 + + steps: + - uses: actions/checkout@v4 + - run: ./scripts/ci-select-xcode.sh "16.0" + - name: Run Fastlane + run: fastlane ui_tests_ios_swift6 device:"iPhone 15 (18.0)" + + - name: Archiving Raw Test Logs + uses: actions/upload-artifact@v4 + if: ${{ failure() || cancelled() }} + with: + name: raw-ios-swift-test-output-${{matrix.xcode}}-${{matrix.device}} + path: | + ~/Library/Logs/scan/*.log + ./fastlane/test_output/** diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index fbffbd7696..ac6695a6d0 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 70; objects = { /* Begin PBXBuildFile section */ @@ -13,7 +13,6 @@ 629EC8BB2B0B5BAE00858855 /* TriggerAppHang.swift in Sources */ = {isa = PBXBuildFile; fileRef = 629EC8AC2B0B537400858855 /* TriggerAppHang.swift */; }; 62C07D5C2AF3E3F500894688 /* BaseUITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C07D5B2AF3E3F500894688 /* BaseUITest.swift */; }; 62C97DBF2CC69B0300DDA204 /* SampleAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 62C97DB92CC69B0200DDA204 /* SampleAssets.xcassets */; }; - 630853532440C60F00DDE4CE /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; }; 637AFDAA243B02760034958B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 637AFDA9243B02760034958B /* AppDelegate.swift */; }; 637AFDAE243B02760034958B /* TransactionsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 637AFDAD243B02760034958B /* TransactionsViewController.swift */; }; 637AFDB1243B02760034958B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 637AFDAF243B02760034958B /* Main.storyboard */; }; @@ -27,9 +26,7 @@ 844DA821282584C300E6B62E /* CoreDataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F57BC427BBD787000D09D4 /* CoreDataViewController.swift */; }; 844DA822282584F700E6B62E /* SentryData.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D845F35927BAD4CC00A4D7A2 /* SentryData.xcdatamodeld */; }; 847670302BAA4AFA001A4E31 /* NSObject+SentryAppSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 8476702F2BAA4AFA001A4E31 /* NSObject+SentryAppSetup.m */; }; - 848A256B286E3351008A8858 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; }; 848A256D286E3351008A8858 /* fatal-error-binary-images-message2.json in Resources */ = {isa = PBXBuildFile; fileRef = D83A30DF279F1F5C00372D0A /* fatal-error-binary-images-message2.json */; }; - 848A256F286E3351008A8858 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; 84A5D72629D2705000388BFA /* ProfilingUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A5D72529D2705000388BFA /* ProfilingUITests.swift */; }; 84A5D72D29D2708D00388BFA /* UITestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A5D72C29D2708D00388BFA /* UITestHelpers.swift */; }; 84AB90712A5001000054C99A /* ProfilingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AB90702A5001000054C99A /* ProfilingViewController.swift */; }; @@ -55,8 +52,6 @@ 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 */; }; @@ -68,10 +63,6 @@ D8269A56274C0F9E00BD5BD5 /* NibViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D890CD3B26CEE2FA001246CF /* NibViewController.xib */; }; 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 */; }; D840D525273A07F400CDF142 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D840D524273A07F400CDF142 /* SceneDelegate.swift */; }; @@ -98,8 +89,6 @@ D890CD3F26CEE31B001246CF /* NibViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D890CD3E26CEE31B001246CF /* NibViewController.swift */; }; 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, ); }; }; D8BC843E2B021C5200A662B7 /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4F33F7271EBD2500C8591E /* SwiftUIView.swift */; }; D8BCCDE22CAFDE9400E8A030 /* Sample.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = D8BCCDE12CAFDE9400E8A030 /* Sample.xcconfig */; }; D8BCCDE32CAFDE9400E8A030 /* Sample.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = D8BCCDE12CAFDE9400E8A030 /* Sample.xcconfig */; }; @@ -122,31 +111,18 @@ D8F3D05F274E6A8B00B56F8C /* AssertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F3D05E274E6A8B00B56F8C /* AssertView.swift */; }; D8F3D062274EBD4800B56F8C /* SpanExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F3D061274EBD4800B56F8C /* SpanExtension.swift */; }; D8F57BC527BBD787000D09D4 /* CoreDataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F57BC427BBD787000D09D4 /* CoreDataViewController.swift */; }; + D8F610CD2CDCC24B00A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CC2CDCC24B00A77147 /* Sentry.framework */; }; + D8F610CE2CDCC24B00A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CC2CDCC24B00A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D8F610D02CDCC25900A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CF2CDCC25900A77147 /* Sentry.framework */; }; + D8F610D12CDCC25900A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CF2CDCC25900A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D8F610D32CDCC26C00A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D22CDCC26C00A77147 /* Sentry.framework */; }; + D8F610D42CDCC26C00A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D22CDCC26C00A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D8F610D62CDCC27200A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D52CDCC27200A77147 /* Sentry.framework */; }; + D8F610D72CDCC27200A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D52CDCC27200A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D8FD68C42C1C86E300A70055 /* TableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FD68C32C1C86E300A70055 /* TableViewController.xib */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 630853312440C44F00DDE4CE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 63AA759B1EB8AEF500D153DE; - remoteInfo = Sentry; - }; - 630853332440C44F00DDE4CE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 63AA76651EB8CB2F00D153DE; - remoteInfo = SentryTests; - }; - 630853512440C60800DDE4CE /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 63AA759A1EB8AEF500D153DE; - remoteInfo = Sentry; - }; 7B64386D26A6C544000D0F65 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 637AFD9E243B02760034958B /* Project object */; @@ -154,13 +130,6 @@ remoteGlobalIDString = 637AFDA5243B02760034958B; remoteInfo = "iOS-Swift"; }; - 848A2562286E3351008A8858 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 63AA759A1EB8AEF500D153DE; - remoteInfo = Sentry; - }; 848A2564286E3351008A8858 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 637AFD9E243B02760034958B /* Project object */; @@ -168,34 +137,6 @@ remoteGlobalIDString = 637AFDA5243B02760034958B; remoteInfo = "iOS-Swift"; }; - 84B7FA5A29B2A86500AD93B1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8431EFD929B27B1100D8DC56; - remoteInfo = SentryProfilerTests; - }; - 84B7FA5C29B2A86500AD93B1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8431F00A29B284F200D8DC56; - remoteInfo = SentryTestUtils; - }; - D8105B5B297E792200299F03 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D8199DAA29376E9B0074249E; - remoteInfo = SentrySwiftUI; - }; - D83A30CA279F075800372D0A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 63AA759A1EB8AEF500D153DE; - remoteInfo = Sentry; - }; D840D532273A07F600CDF142 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 637AFD9E243B02760034958B /* Project object */; @@ -203,13 +144,6 @@ remoteGlobalIDString = D840D51F273A07F400CDF142; remoteInfo = "iOS-SwiftClip"; }; - D84DAD702B177DB2003CF120 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = D84DAD4D2B17428D003CF120; - remoteInfo = SentryTestUtilsDynamic; - }; D85DAA4F274C244F004DF43C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 637AFD9E243B02760034958B /* Project object */; @@ -217,6 +151,13 @@ remoteGlobalIDString = D8269A38274C095E00BD5BD5; remoteInfo = "iOS13-Swift"; }; + D8F610AD2CDCBCF900A77147 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 637AFD9E243B02760034958B /* Project object */; + proxyType = 1; + remoteGlobalIDString = D8F6108C2CDCBCF700A77147; + remoteInfo = "iOS-Swift6"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -226,7 +167,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D83A30D8279F159D00372D0A /* Sentry.framework in Embed Frameworks */, + D8F610D12CDCC25900A77147 /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -237,7 +178,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D83A30DC279F16BA00372D0A /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -248,7 +188,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 848A256F286E3351008A8858 /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -259,8 +198,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D8269A5A274C100300BD5BD5 /* Sentry.framework in Embed Frameworks */, - D8105B62297E824C00299F03 /* SentrySwiftUI.framework in Embed Frameworks */, + D8F610D72CDCC27200A77147 /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -282,7 +220,18 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D8B56CF1273A8D97004DF238 /* Sentry.framework in Embed Frameworks */, + D8F610D42CDCC26C00A77147 /* Sentry.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + D8F610CB2CDCBDAB00A77147 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + D8F610CE2CDCC24B00A77147 /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -294,7 +243,6 @@ 629EC8AC2B0B537400858855 /* TriggerAppHang.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TriggerAppHang.swift; sourceTree = ""; }; 62C07D5B2AF3E3F500894688 /* BaseUITest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseUITest.swift; sourceTree = ""; }; 62C97DB92CC69B0200DDA204 /* SampleAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = SampleAssets.xcassets; path = ../SampleAssets.xcassets; sourceTree = ""; }; - 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sentry.xcodeproj; path = ../../Sentry.xcodeproj; sourceTree = ""; }; 637AFDA6243B02760034958B /* iOS-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 637AFDA9243B02760034958B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 637AFDAD243B02760034958B /* TransactionsViewController.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = TransactionsViewController.swift; sourceTree = ""; tabWidth = 4; }; @@ -383,15 +331,36 @@ D8F3D05E274E6A8B00B56F8C /* AssertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssertView.swift; sourceTree = ""; }; D8F3D061274EBD4800B56F8C /* SpanExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpanExtension.swift; sourceTree = ""; }; D8F57BC427BBD787000D09D4 /* CoreDataViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataViewController.swift; sourceTree = ""; }; + D8F6108D2CDCBCF700A77147 /* iOS-Swift6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS-Swift6.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F610AC2CDCBCF900A77147 /* iOS-Swift6UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "iOS-Swift6UITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F610CC2CDCC24B00A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F610CF2CDCC25900A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F610D22CDCC26C00A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F610D52CDCC27200A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D8FD68C32C1C86E300A70055 /* TableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TableViewController.xib; sourceTree = ""; }; /* End PBXFileReference section */ +/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ + D8F610C02CDCBCF900A77147 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { + isa = PBXFileSystemSynchronizedBuildFileExceptionSet; + membershipExceptions = ( + Info.plist, + ); + target = D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */; + }; +/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ + +/* Begin PBXFileSystemSynchronizedRootGroup section */ + D8F6108E2CDCBCF700A77147 /* iOS-Swift6 */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (D8F610C02CDCBCF900A77147 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = "iOS-Swift6"; sourceTree = ""; }; + D8F610AF2CDCBCF900A77147 /* iOS-Swift6UITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "iOS-Swift6UITests"; sourceTree = ""; }; +/* End PBXFileSystemSynchronizedRootGroup section */ + /* Begin PBXFrameworksBuildPhase section */ 637AFDA3243B02760034958B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 630853532440C60F00DDE4CE /* Sentry.framework in Frameworks */, + D8F610D02CDCC25900A77147 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -406,7 +375,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 848A256B286E3351008A8858 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -414,8 +382,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D8269A59274C100300BD5BD5 /* Sentry.framework in Frameworks */, - D8105B61297E824C00299F03 /* SentrySwiftUI.framework in Frameworks */, + D8F610D62CDCC27200A77147 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -423,7 +390,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D8B56CF0273A8D97004DF238 /* Sentry.framework in Frameworks */, + D8F610D32CDCC26C00A77147 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -434,25 +401,31 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D8F6108A2CDCBCF700A77147 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D8F610CD2CDCC24B00A77147 /* Sentry.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D8F610A92CDCBCF900A77147 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 6308532D2440C44F00DDE4CE /* Products */ = { - isa = PBXGroup; - children = ( - 630853322440C44F00DDE4CE /* Sentry.framework */, - 630853342440C44F00DDE4CE /* SentryTests.xctest */, - D8105B5C297E792200299F03 /* SentrySwiftUI.framework */, - 84B7FA5B29B2A86500AD93B1 /* SentryProfilerTests.xctest */, - 84B7FA5D29B2A86500AD93B1 /* libSentryTestUtils.a */, - D84DAD712B177DB2003CF120 /* SentryTestUtilsDynamic.framework */, - ); - name = Products; - sourceTree = ""; - }; 634C7EC124406A4200AFDE9F /* Frameworks */ = { isa = PBXGroup; children = ( + D8F610D52CDCC27200A77147 /* Sentry.framework */, + D8F610D22CDCC26C00A77147 /* Sentry.framework */, + D8F610CF2CDCC25900A77147 /* Sentry.framework */, + D8F610CC2CDCC24B00A77147 /* Sentry.framework */, ); name = Frameworks; sourceTree = ""; @@ -463,12 +436,13 @@ 62C97DB92CC69B0200DDA204 /* SampleAssets.xcassets */, 84BA72A62C93698E0045B828 /* Shared */, 848A2576286E3490008A8858 /* PerformanceBenchmarks */, - 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */, 637AFDA8243B02760034958B /* iOS-Swift */, 7B64386926A6C544000D0F65 /* iOS-Swift-UITests */, D840D521273A07F400CDF142 /* iOS-SwiftClip */, D8269A3A274C095E00BD5BD5 /* iOS13-Swift */, D85DAA4A274C244F004DF43C /* iOS13-SwiftTests */, + D8F6108E2CDCBCF700A77147 /* iOS-Swift6 */, + D8F610AF2CDCBCF900A77147 /* iOS-Swift6UITests */, 637AFDA7243B02760034958B /* Products */, 634C7EC124406A4200AFDE9F /* Frameworks */, ); @@ -485,6 +459,8 @@ D8269A39274C095E00BD5BD5 /* iOS13-Swift.app */, D85DAA49274C244F004DF43C /* iOS13-SwiftTests.xctest */, 848A2573286E3351008A8858 /* PerformanceBenchmarks.xctest */, + D8F6108D2CDCBCF700A77147 /* iOS-Swift6.app */, + D8F610AC2CDCBCF900A77147 /* iOS-Swift6UITests.xctest */, ); name = Products; sourceTree = ""; @@ -683,7 +659,6 @@ buildRules = ( ); dependencies = ( - 630853522440C60800DDE4CE /* PBXTargetDependency */, D840D533273A07F600CDF142 /* PBXTargetDependency */, ); name = "iOS-Swift"; @@ -705,7 +680,6 @@ buildRules = ( ); dependencies = ( - D83A30CB279F075800372D0A /* PBXTargetDependency */, 7B64386E26A6C544000D0F65 /* PBXTargetDependency */, ); name = "iOS-Swift-UITests"; @@ -727,7 +701,6 @@ buildRules = ( ); dependencies = ( - 848A2561286E3351008A8858 /* PBXTargetDependency */, 848A2563286E3351008A8858 /* PBXTargetDependency */, ); name = PerformanceBenchmarks; @@ -795,13 +768,59 @@ productReference = D85DAA49274C244F004DF43C /* iOS13-SwiftTests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; + D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */ = { + isa = PBXNativeTarget; + buildConfigurationList = D8F610C12CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6" */; + buildPhases = ( + D8F610892CDCBCF700A77147 /* Sources */, + D8F6108A2CDCBCF700A77147 /* Frameworks */, + D8F6108B2CDCBCF700A77147 /* Resources */, + D8F610CB2CDCBDAB00A77147 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + fileSystemSynchronizedGroups = ( + D8F6108E2CDCBCF700A77147 /* iOS-Swift6 */, + ); + name = "iOS-Swift6"; + packageProductDependencies = ( + ); + productName = "iOS-Swift6"; + productReference = D8F6108D2CDCBCF700A77147 /* iOS-Swift6.app */; + productType = "com.apple.product-type.application"; + }; + D8F610AB2CDCBCF900A77147 /* iOS-Swift6UITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = D8F610C82CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6UITests" */; + buildPhases = ( + D8F610A82CDCBCF900A77147 /* Sources */, + D8F610A92CDCBCF900A77147 /* Frameworks */, + D8F610AA2CDCBCF900A77147 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + D8F610AE2CDCBCF900A77147 /* PBXTargetDependency */, + ); + fileSystemSynchronizedGroups = ( + D8F610AF2CDCBCF900A77147 /* iOS-Swift6UITests */, + ); + name = "iOS-Swift6UITests"; + packageProductDependencies = ( + ); + productName = "iOS-Swift6UITests"; + productReference = D8F610AC2CDCBCF900A77147 /* iOS-Swift6UITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 637AFD9E243B02760034958B /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1310; + LastSwiftUpdateCheck = 1610; LastUpgradeCheck = 1200; ORGANIZATIONNAME = Sentry; TargetAttributes = { @@ -826,6 +845,13 @@ CreatedOnToolsVersion = 13.1; TestTargetID = D8269A38274C095E00BD5BD5; }; + D8F6108C2CDCBCF700A77147 = { + CreatedOnToolsVersion = 16.1; + }; + D8F610AB2CDCBCF900A77147 = { + CreatedOnToolsVersion = 16.1; + TestTargetID = D8F6108C2CDCBCF700A77147; + }; }; }; buildConfigurationList = 637AFDA1243B02760034958B /* Build configuration list for PBXProject "iOS-Swift" */; @@ -841,12 +867,6 @@ ); productRefGroup = 637AFDA7243B02760034958B /* Products */; projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 6308532D2440C44F00DDE4CE /* Products */; - ProjectRef = 6308532C2440C44F00DDE4CE /* Sentry.xcodeproj */; - }, - ); projectRoot = ""; targets = ( 637AFDA5243B02760034958B /* iOS-Swift */, @@ -855,55 +875,12 @@ D840D51F273A07F400CDF142 /* iOS-SwiftClip */, D8269A38274C095E00BD5BD5 /* iOS13-Swift */, D85DAA48274C244F004DF43C /* iOS13-SwiftTests */, + D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */, + D8F610AB2CDCBCF900A77147 /* iOS-Swift6UITests */, ); }; /* End PBXProject section */ -/* Begin PBXReferenceProxy section */ - 630853322440C44F00DDE4CE /* Sentry.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = Sentry.framework; - remoteRef = 630853312440C44F00DDE4CE /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 630853342440C44F00DDE4CE /* SentryTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = SentryTests.xctest; - remoteRef = 630853332440C44F00DDE4CE /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84B7FA5B29B2A86500AD93B1 /* SentryProfilerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = SentryProfilerTests.xctest; - remoteRef = 84B7FA5A29B2A86500AD93B1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 84B7FA5D29B2A86500AD93B1 /* libSentryTestUtils.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libSentryTestUtils.a; - remoteRef = 84B7FA5C29B2A86500AD93B1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - D8105B5C297E792200299F03 /* SentrySwiftUI.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = SentrySwiftUI.framework; - remoteRef = D8105B5B297E792200299F03 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - D84DAD712B177DB2003CF120 /* SentryTestUtilsDynamic.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = SentryTestUtilsDynamic.framework; - remoteRef = D84DAD702B177DB2003CF120 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - /* Begin PBXResourcesBuildPhase section */ 637AFDA4243B02760034958B /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -966,6 +943,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D8F6108B2CDCBCF700A77147 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D8F610AA2CDCBCF900A77147 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -1207,34 +1198,33 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D8F610892CDCBCF700A77147 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D8F610A82CDCBCF900A77147 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 630853522440C60800DDE4CE /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Sentry; - targetProxy = 630853512440C60800DDE4CE /* PBXContainerItemProxy */; - }; 7B64386E26A6C544000D0F65 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 637AFDA5243B02760034958B /* iOS-Swift */; targetProxy = 7B64386D26A6C544000D0F65 /* PBXContainerItemProxy */; }; - 848A2561286E3351008A8858 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Sentry; - targetProxy = 848A2562286E3351008A8858 /* PBXContainerItemProxy */; - }; 848A2563286E3351008A8858 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 637AFDA5243B02760034958B /* iOS-Swift */; targetProxy = 848A2564286E3351008A8858 /* PBXContainerItemProxy */; }; - D83A30CB279F075800372D0A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = Sentry; - targetProxy = D83A30CA279F075800372D0A /* PBXContainerItemProxy */; - }; D840D533273A07F600CDF142 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D840D51F273A07F400CDF142 /* iOS-SwiftClip */; @@ -1245,6 +1235,11 @@ target = D8269A38274C095E00BD5BD5 /* iOS13-Swift */; targetProxy = D85DAA4F274C244F004DF43C /* PBXContainerItemProxy */; }; + D8F610AE2CDCBCF900A77147 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */; + targetProxy = D8F610AD2CDCBCF900A77147 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -2220,6 +2215,252 @@ }; name = Release; }; + D8F610B42CDCBCF900A77147 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "iOS-Swift6/Info.plist"; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 6.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + D8F610B52CDCBCF900A77147 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "iOS-Swift6/Info.plist"; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 6.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + D8F610B62CDCBCF900A77147 /* TestCI */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "iOS-Swift6/Info.plist"; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 6.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = TestCI; + }; + D8F610B72CDCBCF900A77147 /* Test */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = "iOS-Swift6/Info.plist"; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; + INFOPLIST_KEY_UIMainStoryboardFile = Main; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 6.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Test; + }; + D8F610BC2CDCBCF900A77147 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = "iOS-Swift6"; + }; + name = Debug; + }; + D8F610BD2CDCBCF900A77147 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = "iOS-Swift6"; + }; + name = Release; + }; + D8F610BE2CDCBCF900A77147 /* TestCI */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = "iOS-Swift6"; + }; + name = TestCI; + }; + D8F610BF2CDCBCF900A77147 /* Test */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 97JCY7859U; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.1; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = "iOS-Swift6"; + }; + name = Test; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -2300,6 +2541,28 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + D8F610C12CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D8F610B42CDCBCF900A77147 /* Debug */, + D8F610B52CDCBCF900A77147 /* Release */, + D8F610B62CDCBCF900A77147 /* TestCI */, + D8F610B72CDCBCF900A77147 /* Test */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D8F610C82CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6UITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D8F610BC2CDCBCF900A77147 /* Debug */, + D8F610BD2CDCBCF900A77147 /* Release */, + D8F610BE2CDCBCF900A77147 /* TestCI */, + D8F610BF2CDCBCF900A77147 /* Test */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ /* Begin XCVersionGroup section */ diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme new file mode 100644 index 0000000000..ef0aaea591 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift b/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift new file mode 100644 index 0000000000..713c037c29 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift @@ -0,0 +1,50 @@ +import UIKit +import Sentry + +@main +class AppDelegate: UIResponder, UIApplicationDelegate { + + func startSentry() { + SentrySDK.start(configureOptions: { options in + options.dsn = "https://6cc9bae94def43cab8444a99e0031c28@o447951.ingest.sentry.io/5428557" + options.beforeSend = { event in + print("Sentry: beforeSend called") + return event + } + options.beforeSendSpan = { span in + print("Sentry: beforeSendSpan called") + return span + } + options.beforeCaptureScreenshot = { _ in + print("Sentry: beforeCaptureScreenshot called") + return true + } + options.beforeCaptureViewHierarchy = { _ in + print("Sentry: beforeCaptureViewHierarchy called") + return true + } + options.attachScreenshot = true + options.attachViewHierarchy = true + options.debug = true + options.sampleRate = 1 + options.tracesSampleRate = 1 + }) + + } + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + startSentry() + return true + } + + // MARK: UISceneSession Lifecycle + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + } + + +} + diff --git a/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json b/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000000..eb87897008 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json b/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..2305880107 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,35 @@ +{ + "images" : [ + { + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "tinted" + } + ], + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/Contents.json b/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/Contents.json new file mode 100644 index 0000000000..73c00596a7 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Samples/iOS-Swift/iOS-Swift6/Base.lproj/LaunchScreen.storyboard b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..865e9329f3 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..3b09dc5016 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/iOS-Swift/iOS-Swift6/Info.plist b/Samples/iOS-Swift/iOS-Swift6/Info.plist new file mode 100644 index 0000000000..dd3c9afdae --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/Info.plist @@ -0,0 +1,25 @@ + + + + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + + diff --git a/Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift b/Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift new file mode 100644 index 0000000000..25a0e41721 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift @@ -0,0 +1,25 @@ +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + } + + func sceneDidBecomeActive(_ scene: UIScene) { + } + + func sceneWillResignActive(_ scene: UIScene) { + } + + func sceneWillEnterForeground(_ scene: UIScene) { + } + + func sceneDidEnterBackground(_ scene: UIScene) { + } +} diff --git a/Samples/iOS-Swift/iOS-Swift6/ViewController.swift b/Samples/iOS-Swift/iOS-Swift6/ViewController.swift new file mode 100644 index 0000000000..d66c06a1b0 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6/ViewController.swift @@ -0,0 +1,11 @@ +import UIKit +import Sentry + +class ViewController: UIViewController { + @IBAction func buttonTapped(_ sender: Any) { + DispatchQueue.global(qos: .utility).async { + SentrySDK.capture(error: NSError(domain: "Swift 6 Test", code: -1)) + } + } +} + diff --git a/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift b/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift new file mode 100644 index 0000000000..0a2ee8ce58 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift @@ -0,0 +1,16 @@ +import XCTest + +final class iOS_Swift6UITests: XCTestCase { + + override func setUpWithError() throws { + continueAfterFailure = false + } + + + @MainActor + func testLauchAndCaptureError() throws { + let app = XCUIApplication() + app.launch() + app.buttons["btError"].tap() + } +} diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 853803d8d7..31076a92f8 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -206,6 +206,14 @@ platform :ios do configuration: configuration ) end + + lane :ui_tests_ios_swift6 do + run_tests( + workspace: "Sentry.xcworkspace", + scheme: "iOS-Swift6", + configuration: configuration + ) + end lane :ui_tests_ios_objc do run_tests( From 428871086cb31417f0cef2dc398b375934169bc9 Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Thu, 7 Nov 2024 09:57:21 +0000 Subject: [PATCH 05/28] Format code --- Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift | 4 +--- Samples/iOS-Swift/iOS-Swift6/ViewController.swift | 3 +-- Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift b/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift index 713c037c29..a5f0380310 100644 --- a/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift +++ b/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift @@ -1,5 +1,5 @@ -import UIKit import Sentry +import UIKit @main class AppDelegate: UIResponder, UIApplicationDelegate { @@ -45,6 +45,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { } - } - diff --git a/Samples/iOS-Swift/iOS-Swift6/ViewController.swift b/Samples/iOS-Swift/iOS-Swift6/ViewController.swift index d66c06a1b0..9011b271fb 100644 --- a/Samples/iOS-Swift/iOS-Swift6/ViewController.swift +++ b/Samples/iOS-Swift/iOS-Swift6/ViewController.swift @@ -1,5 +1,5 @@ -import UIKit import Sentry +import UIKit class ViewController: UIViewController { @IBAction func buttonTapped(_ sender: Any) { @@ -8,4 +8,3 @@ class ViewController: UIViewController { } } } - diff --git a/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift b/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift index 0a2ee8ce58..f053c32cda 100644 --- a/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift +++ b/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift @@ -6,7 +6,6 @@ final class iOS_Swift6UITests: XCTestCase { continueAfterFailure = false } - @MainActor func testLauchAndCaptureError() throws { let app = XCUIApplication() From 2719dd118984c06bcd5f580b381d1febf3b05bea Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 11:08:56 +0100 Subject: [PATCH 06/28] format --- Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift | 4 +--- Samples/iOS-Swift/iOS-Swift6/ViewController.swift | 3 +-- .../{iOS_Swift6UITests.swift => iOS_SwiftUITests.swift} | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename Samples/iOS-Swift/iOS-Swift6UITests/{iOS_Swift6UITests.swift => iOS_SwiftUITests.swift} (85%) diff --git a/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift b/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift index 713c037c29..a5f0380310 100644 --- a/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift +++ b/Samples/iOS-Swift/iOS-Swift6/AppDelegate.swift @@ -1,5 +1,5 @@ -import UIKit import Sentry +import UIKit @main class AppDelegate: UIResponder, UIApplicationDelegate { @@ -45,6 +45,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { } - } - diff --git a/Samples/iOS-Swift/iOS-Swift6/ViewController.swift b/Samples/iOS-Swift/iOS-Swift6/ViewController.swift index d66c06a1b0..9011b271fb 100644 --- a/Samples/iOS-Swift/iOS-Swift6/ViewController.swift +++ b/Samples/iOS-Swift/iOS-Swift6/ViewController.swift @@ -1,5 +1,5 @@ -import UIKit import Sentry +import UIKit class ViewController: UIViewController { @IBAction func buttonTapped(_ sender: Any) { @@ -8,4 +8,3 @@ class ViewController: UIViewController { } } } - diff --git a/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift b/Samples/iOS-Swift/iOS-Swift6UITests/iOS_SwiftUITests.swift similarity index 85% rename from Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift rename to Samples/iOS-Swift/iOS-Swift6UITests/iOS_SwiftUITests.swift index 0a2ee8ce58..a0dfe4fdb9 100644 --- a/Samples/iOS-Swift/iOS-Swift6UITests/iOS_Swift6UITests.swift +++ b/Samples/iOS-Swift/iOS-Swift6UITests/iOS_SwiftUITests.swift @@ -1,12 +1,11 @@ import XCTest -final class iOS_Swift6UITests: XCTestCase { +final class iOS_SwiftUITests: XCTestCase { override func setUpWithError() throws { continueAfterFailure = false } - @MainActor func testLauchAndCaptureError() throws { let app = XCUIApplication() From 40fd16c908265ee26f1135dda714a1a6386a09fe Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 11:14:14 +0100 Subject: [PATCH 07/28] fixes --- .github/workflows/ui-tests.yml | 2 +- .../iOS-Swift6UITests/{iOS_SwiftUITests.swift => UITests.swift} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Samples/iOS-Swift/iOS-Swift6UITests/{iOS_SwiftUITests.swift => UITests.swift} (86%) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index c6e3a739f6..95a0812221 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -117,7 +117,7 @@ jobs: steps: - uses: actions/checkout@v4 - - run: ./scripts/ci-select-xcode.sh "16.0" + - run: ./scripts/ci-select-xcode.sh "16.1" - name: Run Fastlane run: fastlane ui_tests_ios_swift6 device:"iPhone 15 (18.0)" diff --git a/Samples/iOS-Swift/iOS-Swift6UITests/iOS_SwiftUITests.swift b/Samples/iOS-Swift/iOS-Swift6UITests/UITests.swift similarity index 86% rename from Samples/iOS-Swift/iOS-Swift6UITests/iOS_SwiftUITests.swift rename to Samples/iOS-Swift/iOS-Swift6UITests/UITests.swift index a0dfe4fdb9..104beedf60 100644 --- a/Samples/iOS-Swift/iOS-Swift6UITests/iOS_SwiftUITests.swift +++ b/Samples/iOS-Swift/iOS-Swift6UITests/UITests.swift @@ -1,6 +1,6 @@ import XCTest -final class iOS_SwiftUITests: XCTestCase { +final class UITests: XCTestCase { override func setUpWithError() throws { continueAfterFailure = false From bca4bd09246d581f695b82231e83bd2c3bd856ff Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 13:12:56 +0100 Subject: [PATCH 08/28] schemes --- .github/workflows/ui-tests-critical.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-tests-critical.yml b/.github/workflows/ui-tests-critical.yml index a54b365b7a..20cdc08058 100644 --- a/.github/workflows/ui-tests-critical.yml +++ b/.github/workflows/ui-tests-critical.yml @@ -22,7 +22,7 @@ jobs: runs-on: macos-14 steps: - uses: actions/checkout@v4 - - run: ./scripts/ci-select-xcode.sh 16 + - run: ./scripts/ci-select-xcode.sh "16.0" - uses: ruby/setup-ruby@v1 with: bundler-cache: true From 6a472960e4ff5b8050eb71ee543451aa3513295e Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 13:34:07 +0100 Subject: [PATCH 09/28] Update ui-tests.yml --- .github/workflows/ui-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 95a0812221..edec116a14 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}} - + # GitHub Actions sometimes fail to launch the UI tests. Therefore we retry - name: Run Fastlane run: for i in {1..2}; do fastlane ui_tests_ios_swiftui device:"${{matrix.device}}" && break ; done @@ -94,6 +94,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}} + - run: xcodebuild -workspace Sentry.xcworkspace -list - name: Create iOS 16.4 simulator if: ${{ matrix.device == 'iPhone 14 (16.4)' }} @@ -119,7 +120,7 @@ jobs: - uses: actions/checkout@v4 - run: ./scripts/ci-select-xcode.sh "16.1" - name: Run Fastlane - run: fastlane ui_tests_ios_swift6 device:"iPhone 15 (18.0)" + run: fastlane ui_tests_ios_swift6 device:"iPhone 15 (17.2)" - name: Archiving Raw Test Logs uses: actions/upload-artifact@v4 From 28897c83922cea633b5efc852d5a6c6c1b606f9a Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 14:24:53 +0100 Subject: [PATCH 10/28] removed schemes --- .../xcshareddata/xcschemes/iOS-Swift.xcscheme | 253 ------------------ .../xcschemes/iOS13-Swift.xcscheme | 94 ------- 2 files changed, 347 deletions(-) delete mode 100644 Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme delete mode 100644 Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme deleted file mode 100644 index 1a8ce8b50e..0000000000 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme deleted file mode 100644 index 7abf7eb8a3..0000000000 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From a0020ca0d8e2b3df7af476554fce5230a8b05088 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 14:30:26 +0100 Subject: [PATCH 11/28] schemes --- .../xcshareddata/xcschemes/iOS-Swift.xcscheme | 253 ++++++++++++++++++ .../xcschemes/iOS13-Swift.xcscheme | 94 +++++++ 2 files changed, 347 insertions(+) create mode 100644 Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme create mode 100644 Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme new file mode 100644 index 0000000000..1a8ce8b50e --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift.xcscheme @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme new file mode 100644 index 0000000000..7abf7eb8a3 --- /dev/null +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS13-Swift.xcscheme @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ae90549e08cb1bc105042cd7fc3cfd0cfd63c7b3 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 14:35:12 +0100 Subject: [PATCH 12/28] Update Fastfile --- fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 31076a92f8..9c13c52595 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -207,10 +207,11 @@ platform :ios do ) end - lane :ui_tests_ios_swift6 do + lane :ui_tests_ios_swift6 do |options| run_tests( workspace: "Sentry.xcworkspace", scheme: "iOS-Swift6", + device: options[:device], configuration: configuration ) end From 209eecf59903a04ef127cb4777dd1e472cea7a2f Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 14:53:16 +0100 Subject: [PATCH 13/28] Update project.pbxproj --- Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index ac6695a6d0..17fdf9d709 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 70; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -855,7 +855,7 @@ }; }; buildConfigurationList = 637AFDA1243B02760034958B /* Build configuration list for PBXProject "iOS-Swift" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 13.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( From 7dcfe5e6eaebfb5d514a03b879b090c696fe006c Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Thu, 7 Nov 2024 14:21:19 +0000 Subject: [PATCH 14/28] Format code --- Sources/Sentry/SentrySessionReplayIntegration.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Sources/Sentry/SentrySessionReplayIntegration.m b/Sources/Sentry/SentrySessionReplayIntegration.m index 3c5245dac7..85c1dd746a 100644 --- a/Sources/Sentry/SentrySessionReplayIntegration.m +++ b/Sources/Sentry/SentrySessionReplayIntegration.m @@ -48,8 +48,10 @@ @implementation SentrySessionReplayIntegration { SentryNSNotificationCenterWrapper *_notificationCenter; SentryOnDemandReplay *_resumeReplayMaker; id _rateLimits; - // We need to use this variable to identify whether rate limiting was ever activated for session replay in this session, instead of always looking for the rate status in `SentryRateLimits` - // This is the easiest way to ensure segment 0 will always reach the server, because session replay absolutely needs segment 0 to make replay work. + // We need to use this variable to identify whether rate limiting was ever activated for session + // replay in this session, instead of always looking for the rate status in `SentryRateLimits` + // This is the easiest way to ensure segment 0 will always reach the server, because session + // replay absolutely needs segment 0 to make replay work. BOOL _rateLimited; } From 6ecd34d6c0cc90e82e2784c4f9de5cd91b335b8e Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 15:35:27 +0100 Subject: [PATCH 15/28] fix --- .../iOS-Swift.xcodeproj/project.pbxproj | 291 ++++++++++-------- .../iOS-Swift6/Base.lproj/Main.storyboard | 19 +- .../iOS-Swift/iOS-Swift6/SceneDelegate.swift | 5 +- 3 files changed, 175 insertions(+), 140 deletions(-) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index 17fdf9d709..f96ce5beba 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -111,14 +111,15 @@ D8F3D05F274E6A8B00B56F8C /* AssertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F3D05E274E6A8B00B56F8C /* AssertView.swift */; }; D8F3D062274EBD4800B56F8C /* SpanExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F3D061274EBD4800B56F8C /* SpanExtension.swift */; }; D8F57BC527BBD787000D09D4 /* CoreDataViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F57BC427BBD787000D09D4 /* CoreDataViewController.swift */; }; - D8F610CD2CDCC24B00A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CC2CDCC24B00A77147 /* Sentry.framework */; }; - D8F610CE2CDCC24B00A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CC2CDCC24B00A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - D8F610D02CDCC25900A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CF2CDCC25900A77147 /* Sentry.framework */; }; - D8F610D12CDCC25900A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610CF2CDCC25900A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - D8F610D32CDCC26C00A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D22CDCC26C00A77147 /* Sentry.framework */; }; - D8F610D42CDCC26C00A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D22CDCC26C00A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - D8F610D62CDCC27200A77147 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D52CDCC27200A77147 /* Sentry.framework */; }; - D8F610D72CDCC27200A77147 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D8F610D52CDCC27200A77147 /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D8F71A4F2CDD03B900334022 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F71A4E2CDD03B900334022 /* AppDelegate.swift */; }; + D8F71A512CDD03B900334022 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F71A502CDD03B900334022 /* SceneDelegate.swift */; }; + D8F71A532CDD03B900334022 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F71A522CDD03B900334022 /* ViewController.swift */; }; + D8F71A562CDD03B900334022 /* Base in Resources */ = {isa = PBXBuildFile; fileRef = D8F71A552CDD03B900334022 /* Base */; }; + D8F71A582CDD03BB00334022 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8F71A572CDD03BB00334022 /* Assets.xcassets */; }; + D8F71A5B2CDD03BB00334022 /* Base in Resources */ = {isa = PBXBuildFile; fileRef = D8F71A5A2CDD03BB00334022 /* Base */; }; + D8F71A702CDD03BB00334022 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F71A6F2CDD03BB00334022 /* UITests.swift */; }; + D8F71A822CDD04C200334022 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; }; + D8F71A832CDD04C200334022 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D8FD68C42C1C86E300A70055 /* TableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FD68C32C1C86E300A70055 /* TableViewController.xib */; }; /* End PBXBuildFile section */ @@ -151,11 +152,11 @@ remoteGlobalIDString = D8269A38274C095E00BD5BD5; remoteInfo = "iOS13-Swift"; }; - D8F610AD2CDCBCF900A77147 /* PBXContainerItemProxy */ = { + D8F71A6C2CDD03BB00334022 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 637AFD9E243B02760034958B /* Project object */; proxyType = 1; - remoteGlobalIDString = D8F6108C2CDCBCF700A77147; + remoteGlobalIDString = D8F71A4B2CDD03B900334022; remoteInfo = "iOS-Swift6"; }; /* End PBXContainerItemProxy section */ @@ -236,6 +237,17 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; + D8F71A842CDD04C200334022 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + D8F71A832CDD04C200334022 /* Sentry.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -331,12 +343,16 @@ D8F3D05E274E6A8B00B56F8C /* AssertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssertView.swift; sourceTree = ""; }; D8F3D061274EBD4800B56F8C /* SpanExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpanExtension.swift; sourceTree = ""; }; D8F57BC427BBD787000D09D4 /* CoreDataViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataViewController.swift; sourceTree = ""; }; - D8F6108D2CDCBCF700A77147 /* iOS-Swift6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS-Swift6.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - D8F610AC2CDCBCF900A77147 /* iOS-Swift6UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "iOS-Swift6UITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - D8F610CC2CDCC24B00A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D8F610CF2CDCC25900A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D8F610D22CDCC26C00A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D8F610D52CDCC27200A77147 /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F71A4C2CDD03B900334022 /* iOS-Swift6.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS-Swift6.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F71A4E2CDD03B900334022 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + D8F71A502CDD03B900334022 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + D8F71A522CDD03B900334022 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + D8F71A552CDD03B900334022 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + D8F71A572CDD03BB00334022 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + D8F71A5A2CDD03BB00334022 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + D8F71A5C2CDD03BB00334022 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D8F71A6B2CDD03BB00334022 /* iOS-Swift6UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "iOS-Swift6UITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + D8F71A6F2CDD03BB00334022 /* UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITests.swift; sourceTree = ""; }; D8FD68C32C1C86E300A70055 /* TableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TableViewController.xib; sourceTree = ""; }; /* End PBXFileReference section */ @@ -401,15 +417,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D8F6108A2CDCBCF700A77147 /* Frameworks */ = { + D8F71A492CDD03B900334022 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D8F610CD2CDCC24B00A77147 /* Sentry.framework in Frameworks */, + D8F71A822CDD04C200334022 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - D8F610A92CDCBCF900A77147 /* Frameworks */ = { + D8F71A682CDD03BB00334022 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -441,8 +457,8 @@ D840D521273A07F400CDF142 /* iOS-SwiftClip */, D8269A3A274C095E00BD5BD5 /* iOS13-Swift */, D85DAA4A274C244F004DF43C /* iOS13-SwiftTests */, - D8F6108E2CDCBCF700A77147 /* iOS-Swift6 */, - D8F610AF2CDCBCF900A77147 /* iOS-Swift6UITests */, + D8F71A4D2CDD03B900334022 /* iOS-Swift6 */, + D8F71A6E2CDD03BB00334022 /* iOS-Swift6UITests */, 637AFDA7243B02760034958B /* Products */, 634C7EC124406A4200AFDE9F /* Frameworks */, ); @@ -459,8 +475,8 @@ D8269A39274C095E00BD5BD5 /* iOS13-Swift.app */, D85DAA49274C244F004DF43C /* iOS13-SwiftTests.xctest */, 848A2573286E3351008A8858 /* PerformanceBenchmarks.xctest */, - D8F6108D2CDCBCF700A77147 /* iOS-Swift6.app */, - D8F610AC2CDCBCF900A77147 /* iOS-Swift6UITests.xctest */, + D8F71A4C2CDD03B900334022 /* iOS-Swift6.app */, + D8F71A6B2CDD03BB00334022 /* iOS-Swift6UITests.xctest */, ); name = Products; sourceTree = ""; @@ -641,6 +657,28 @@ path = Extensions; sourceTree = ""; }; + D8F71A4D2CDD03B900334022 /* iOS-Swift6 */ = { + isa = PBXGroup; + children = ( + D8F71A4E2CDD03B900334022 /* AppDelegate.swift */, + D8F71A502CDD03B900334022 /* SceneDelegate.swift */, + D8F71A522CDD03B900334022 /* ViewController.swift */, + D8F71A542CDD03B900334022 /* Main.storyboard */, + D8F71A572CDD03BB00334022 /* Assets.xcassets */, + D8F71A592CDD03BB00334022 /* LaunchScreen.storyboard */, + D8F71A5C2CDD03BB00334022 /* Info.plist */, + ); + path = "iOS-Swift6"; + sourceTree = ""; + }; + D8F71A6E2CDD03BB00334022 /* iOS-Swift6UITests */ = { + isa = PBXGroup; + children = ( + D8F71A6F2CDD03BB00334022 /* UITests.swift */, + ); + path = "iOS-Swift6UITests"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -768,50 +806,40 @@ productReference = D85DAA49274C244F004DF43C /* iOS13-SwiftTests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; - D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */ = { + D8F71A4B2CDD03B900334022 /* iOS-Swift6 */ = { isa = PBXNativeTarget; - buildConfigurationList = D8F610C12CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6" */; + buildConfigurationList = D8F71A732CDD03BB00334022 /* Build configuration list for PBXNativeTarget "iOS-Swift6" */; buildPhases = ( - D8F610892CDCBCF700A77147 /* Sources */, - D8F6108A2CDCBCF700A77147 /* Frameworks */, - D8F6108B2CDCBCF700A77147 /* Resources */, - D8F610CB2CDCBDAB00A77147 /* Embed Frameworks */, + D8F71A482CDD03B900334022 /* Sources */, + D8F71A492CDD03B900334022 /* Frameworks */, + D8F71A4A2CDD03B900334022 /* Resources */, + D8F71A842CDD04C200334022 /* Embed Frameworks */, ); buildRules = ( ); dependencies = ( ); - fileSystemSynchronizedGroups = ( - D8F6108E2CDCBCF700A77147 /* iOS-Swift6 */, - ); name = "iOS-Swift6"; - packageProductDependencies = ( - ); productName = "iOS-Swift6"; - productReference = D8F6108D2CDCBCF700A77147 /* iOS-Swift6.app */; + productReference = D8F71A4C2CDD03B900334022 /* iOS-Swift6.app */; productType = "com.apple.product-type.application"; }; - D8F610AB2CDCBCF900A77147 /* iOS-Swift6UITests */ = { + D8F71A6A2CDD03BB00334022 /* iOS-Swift6UITests */ = { isa = PBXNativeTarget; - buildConfigurationList = D8F610C82CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6UITests" */; + buildConfigurationList = D8F71A7D2CDD03BB00334022 /* Build configuration list for PBXNativeTarget "iOS-Swift6UITests" */; buildPhases = ( - D8F610A82CDCBCF900A77147 /* Sources */, - D8F610A92CDCBCF900A77147 /* Frameworks */, - D8F610AA2CDCBCF900A77147 /* Resources */, + D8F71A672CDD03BB00334022 /* Sources */, + D8F71A682CDD03BB00334022 /* Frameworks */, + D8F71A692CDD03BB00334022 /* Resources */, ); buildRules = ( ); dependencies = ( - D8F610AE2CDCBCF900A77147 /* PBXTargetDependency */, - ); - fileSystemSynchronizedGroups = ( - D8F610AF2CDCBCF900A77147 /* iOS-Swift6UITests */, + D8F71A6D2CDD03BB00334022 /* PBXTargetDependency */, ); name = "iOS-Swift6UITests"; - packageProductDependencies = ( - ); productName = "iOS-Swift6UITests"; - productReference = D8F610AC2CDCBCF900A77147 /* iOS-Swift6UITests.xctest */; + productReference = D8F71A6B2CDD03BB00334022 /* iOS-Swift6UITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ @@ -820,7 +848,7 @@ 637AFD9E243B02760034958B /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1610; + LastSwiftUpdateCheck = 1540; LastUpgradeCheck = 1200; ORGANIZATIONNAME = Sentry; TargetAttributes = { @@ -845,17 +873,17 @@ CreatedOnToolsVersion = 13.1; TestTargetID = D8269A38274C095E00BD5BD5; }; - D8F6108C2CDCBCF700A77147 = { - CreatedOnToolsVersion = 16.1; + D8F71A4B2CDD03B900334022 = { + CreatedOnToolsVersion = 15.4; }; - D8F610AB2CDCBCF900A77147 = { - CreatedOnToolsVersion = 16.1; - TestTargetID = D8F6108C2CDCBCF700A77147; + D8F71A6A2CDD03BB00334022 = { + CreatedOnToolsVersion = 15.4; + TestTargetID = D8F71A4B2CDD03B900334022; }; }; }; buildConfigurationList = 637AFDA1243B02760034958B /* Build configuration list for PBXProject "iOS-Swift" */; - compatibilityVersion = "Xcode 13.0"; + compatibilityVersion = "Xcode 15.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -875,8 +903,8 @@ D840D51F273A07F400CDF142 /* iOS-SwiftClip */, D8269A38274C095E00BD5BD5 /* iOS13-Swift */, D85DAA48274C244F004DF43C /* iOS13-SwiftTests */, - D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */, - D8F610AB2CDCBCF900A77147 /* iOS-Swift6UITests */, + D8F71A4B2CDD03B900334022 /* iOS-Swift6 */, + D8F71A6A2CDD03BB00334022 /* iOS-Swift6UITests */, ); }; /* End PBXProject section */ @@ -943,14 +971,17 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D8F6108B2CDCBCF700A77147 /* Resources */ = { + D8F71A4A2CDD03B900334022 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + D8F71A582CDD03BB00334022 /* Assets.xcassets in Resources */, + D8F71A5B2CDD03BB00334022 /* Base in Resources */, + D8F71A562CDD03B900334022 /* Base in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - D8F610AA2CDCBCF900A77147 /* Resources */ = { + D8F71A692CDD03BB00334022 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -1198,17 +1229,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D8F610892CDCBCF700A77147 /* Sources */ = { + D8F71A482CDD03B900334022 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D8F71A532CDD03B900334022 /* ViewController.swift in Sources */, + D8F71A4F2CDD03B900334022 /* AppDelegate.swift in Sources */, + D8F71A512CDD03B900334022 /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - D8F610A82CDCBCF900A77147 /* Sources */ = { + D8F71A672CDD03BB00334022 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + D8F71A702CDD03BB00334022 /* UITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1235,10 +1270,10 @@ target = D8269A38274C095E00BD5BD5 /* iOS13-Swift */; targetProxy = D85DAA4F274C244F004DF43C /* PBXContainerItemProxy */; }; - D8F610AE2CDCBCF900A77147 /* PBXTargetDependency */ = { + D8F71A6D2CDD03BB00334022 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */; - targetProxy = D8F610AD2CDCBCF900A77147 /* PBXContainerItemProxy */; + target = D8F71A4B2CDD03B900334022 /* iOS-Swift6 */; + targetProxy = D8F71A6C2CDD03BB00334022 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1283,6 +1318,22 @@ name = LaunchScreen.storyboard; sourceTree = ""; }; + D8F71A542CDD03B900334022 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + D8F71A552CDD03B900334022 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + D8F71A592CDD03BB00334022 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + D8F71A5A2CDD03BB00334022 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -1428,7 +1479,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1456,7 +1507,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -1642,7 +1693,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Test; @@ -1874,7 +1925,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = TestCI; @@ -2215,18 +2266,16 @@ }; name = Release; }; - D8F610B42CDCBCF900A77147 /* Debug */ = { + D8F71A742CDD03BB00334022 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + DEVELOPMENT_TEAM = 97JCY7859U; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -2236,36 +2285,32 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - D8F610B52CDCBCF900A77147 /* Release */ = { + D8F71A752CDD03BB00334022 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + DEVELOPMENT_TEAM = 97JCY7859U; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -2275,35 +2320,31 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; - D8F610B62CDCBCF900A77147 /* TestCI */ = { + D8F71A762CDD03BB00334022 /* TestCI */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + DEVELOPMENT_TEAM = 97JCY7859U; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -2313,35 +2354,31 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = TestCI; }; - D8F610B72CDCBCF900A77147 /* Test */ = { + D8F71A772CDD03BB00334022 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; + DEVELOPMENT_TEAM = 97JCY7859U; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -2351,26 +2388,25 @@ INFOPLIST_KEY_UIMainStoryboardFile = Main; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; + PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Test; }; - D8F610BC2CDCBCF900A77147 /* Debug */ = { + D8F71A7E2CDD03BB00334022 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; @@ -2379,7 +2415,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; @@ -2392,9 +2428,10 @@ }; name = Debug; }; - D8F610BD2CDCBCF900A77147 /* Release */ = { + D8F71A7F2CDD03BB00334022 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; @@ -2403,7 +2440,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; @@ -2415,9 +2452,10 @@ }; name = Release; }; - D8F610BE2CDCBCF900A77147 /* TestCI */ = { + D8F71A802CDD03BB00334022 /* TestCI */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; @@ -2426,7 +2464,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; @@ -2438,9 +2476,10 @@ }; name = TestCI; }; - D8F610BF2CDCBCF900A77147 /* Test */ = { + D8F71A812CDD03BB00334022 /* Test */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; @@ -2449,7 +2488,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.1; + IPHONEOS_DEPLOYMENT_TARGET = 17.5; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6UITests"; @@ -2541,24 +2580,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D8F610C12CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6" */ = { + D8F71A732CDD03BB00334022 /* Build configuration list for PBXNativeTarget "iOS-Swift6" */ = { isa = XCConfigurationList; buildConfigurations = ( - D8F610B42CDCBCF900A77147 /* Debug */, - D8F610B52CDCBCF900A77147 /* Release */, - D8F610B62CDCBCF900A77147 /* TestCI */, - D8F610B72CDCBCF900A77147 /* Test */, + D8F71A742CDD03BB00334022 /* Debug */, + D8F71A752CDD03BB00334022 /* Release */, + D8F71A762CDD03BB00334022 /* TestCI */, + D8F71A772CDD03BB00334022 /* Test */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - D8F610C82CDCBCF900A77147 /* Build configuration list for PBXNativeTarget "iOS-Swift6UITests" */ = { + D8F71A7D2CDD03BB00334022 /* Build configuration list for PBXNativeTarget "iOS-Swift6UITests" */ = { isa = XCConfigurationList; buildConfigurations = ( - D8F610BC2CDCBCF900A77147 /* Debug */, - D8F610BD2CDCBCF900A77147 /* Release */, - D8F610BE2CDCBCF900A77147 /* TestCI */, - D8F610BF2CDCBCF900A77147 /* Test */, + D8F71A7E2CDD03BB00334022 /* Debug */, + D8F71A7F2CDD03BB00334022 /* Release */, + D8F71A802CDD03BB00334022 /* TestCI */, + D8F71A812CDD03BB00334022 /* Test */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard index 3b09dc5016..12c2998f92 100644 --- a/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard +++ b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -16,27 +16,24 @@ - - - + + - + diff --git a/Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift b/Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift index 25a0e41721..84d9608c49 100644 --- a/Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift +++ b/Samples/iOS-Swift/iOS-Swift6/SceneDelegate.swift @@ -1,11 +1,10 @@ import UIKit class SceneDelegate: UIResponder, UIWindowSceneDelegate { - var window: UIWindow? - + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - guard let _ = (scene as? UIWindowScene) else { return } + guard let _ = (scene as? UIWindowScene) else { return } } func sceneDidDisconnect(_ scene: UIScene) { From 82bf56f1f1ccef7256adabd8b0dc5846246e4a71 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 15:37:55 +0100 Subject: [PATCH 16/28] fix --- .../iOS-Swift.xcodeproj/project.pbxproj | 52 +++---------------- .../xcschemes/iOS-Swift6.xcscheme | 8 +-- .../iOS-Swift6/Base.lproj/Main.storyboard | 7 ++- 3 files changed, 17 insertions(+), 50 deletions(-) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index f96ce5beba..4534cfaf7d 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -118,8 +118,8 @@ D8F71A582CDD03BB00334022 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8F71A572CDD03BB00334022 /* Assets.xcassets */; }; D8F71A5B2CDD03BB00334022 /* Base in Resources */ = {isa = PBXBuildFile; fileRef = D8F71A5A2CDD03BB00334022 /* Base */; }; D8F71A702CDD03BB00334022 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F71A6F2CDD03BB00334022 /* UITests.swift */; }; - D8F71A822CDD04C200334022 /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; }; - D8F71A832CDD04C200334022 /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 630853322440C44F00DDE4CE /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D8F71A822CDD04C200334022 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + D8F71A832CDD04C200334022 /* (null) in Embed Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D8FD68C42C1C86E300A70055 /* TableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FD68C32C1C86E300A70055 /* TableViewController.xib */; }; /* End PBXBuildFile section */ @@ -168,7 +168,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D8F610D12CDCC25900A77147 /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -199,7 +198,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D8F610D72CDCC27200A77147 /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -221,18 +219,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D8F610D42CDCC26C00A77147 /* Sentry.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - D8F610CB2CDCBDAB00A77147 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - D8F610CE2CDCC24B00A77147 /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -243,7 +229,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D8F71A832CDD04C200334022 /* Sentry.framework in Embed Frameworks */, + D8F71A832CDD04C200334022 /* (null) in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -356,27 +342,11 @@ D8FD68C32C1C86E300A70055 /* TableViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TableViewController.xib; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ - D8F610C02CDCBCF900A77147 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - Info.plist, - ); - target = D8F6108C2CDCBCF700A77147 /* iOS-Swift6 */; - }; -/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ - -/* Begin PBXFileSystemSynchronizedRootGroup section */ - D8F6108E2CDCBCF700A77147 /* iOS-Swift6 */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (D8F610C02CDCBCF900A77147 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = "iOS-Swift6"; sourceTree = ""; }; - D8F610AF2CDCBCF900A77147 /* iOS-Swift6UITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "iOS-Swift6UITests"; sourceTree = ""; }; -/* End PBXFileSystemSynchronizedRootGroup section */ - /* Begin PBXFrameworksBuildPhase section */ 637AFDA3243B02760034958B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D8F610D02CDCC25900A77147 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -398,7 +368,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D8F610D62CDCC27200A77147 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -406,7 +375,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D8F610D32CDCC26C00A77147 /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -421,7 +389,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D8F71A822CDD04C200334022 /* Sentry.framework in Frameworks */, + D8F71A822CDD04C200334022 /* (null) in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -438,10 +406,6 @@ 634C7EC124406A4200AFDE9F /* Frameworks */ = { isa = PBXGroup; children = ( - D8F610D52CDCC27200A77147 /* Sentry.framework */, - D8F610D22CDCC26C00A77147 /* Sentry.framework */, - D8F610CF2CDCC25900A77147 /* Sentry.framework */, - D8F610CC2CDCC24B00A77147 /* Sentry.framework */, ); name = Frameworks; sourceTree = ""; @@ -2296,7 +2260,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -2330,7 +2294,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -2364,7 +2328,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = TestCI; @@ -2398,7 +2362,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.iOS-Swift6"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Test; diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme index ef0aaea591..5e406c71de 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift6.xcscheme @@ -15,7 +15,7 @@ buildForAnalyzing = "YES"> @@ -35,7 +35,7 @@ parallelizable = "YES"> @@ -68,7 +68,7 @@ runnableDebuggingMode = "0"> @@ -85,7 +85,7 @@ runnableDebuggingMode = "0"> diff --git a/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard index 12c2998f92..d807513902 100644 --- a/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard +++ b/Samples/iOS-Swift/iOS-Swift6/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -21,6 +21,9 @@ + + + From f23423e4fb70b3fbfa520221bfc49790990724e8 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 15:50:48 +0100 Subject: [PATCH 17/28] revert swift 6 form ios-swift sample --- .github/workflows/ui-tests.yml | 1 - Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index edec116a14..1e3c137af9 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -94,7 +94,6 @@ jobs: steps: - uses: actions/checkout@v4 - run: ./scripts/ci-select-xcode.sh ${{matrix.xcode}} - - run: xcodebuild -workspace Sentry.xcworkspace -list - name: Create iOS 16.4 simulator if: ${{ matrix.device == 'iPhone 14 (16.4)' }} diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index 4534cfaf7d..479465fc38 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -1443,7 +1443,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1471,7 +1471,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -1657,7 +1657,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Test; @@ -1889,7 +1889,7 @@ "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; - SWIFT_VERSION = 6.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = TestCI; From 5872f2fd71dda68dc5dac639b29f23a8b6413b25 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 16:17:15 +0100 Subject: [PATCH 18/28] Update project.pbxproj --- .../iOS-Swift.xcodeproj/project.pbxproj | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index 479465fc38..cd87eb0f4b 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -80,6 +80,14 @@ D8444E57275F795D0042F4DE /* UIViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8444E4B275E38090042F4DE /* UIViewControllerExtension.swift */; }; D845F35B27BAD4CC00A4D7A2 /* SentryData.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = D845F35927BAD4CC00A4D7A2 /* SentryData.xcdatamodeld */; }; D85DAA4C274C244F004DF43C /* LaunchUITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D85DAA4B274C244F004DF43C /* LaunchUITest.swift */; }; + D86B9C972CDD11430039211C /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C962CDD11430039211C /* Sentry.framework */; }; + D86B9C982CDD11430039211C /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C962CDD11430039211C /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D86B9C9A2CDD114E0039211C /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C992CDD114E0039211C /* Sentry.framework */; }; + D86B9C9B2CDD114E0039211C /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C992CDD114E0039211C /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D86B9C9D2CDD115A0039211C /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C9C2CDD115A0039211C /* Sentry.framework */; }; + D86B9C9E2CDD115A0039211C /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C9C2CDD115A0039211C /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D86B9CA02CDD11670039211C /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C9F2CDD11670039211C /* Sentry.framework */; }; + D86B9CA12CDD11670039211C /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C9F2CDD11670039211C /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D8832B132AF4F7FE00C522B0 /* TopViewControllerInspector.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8832B122AF4F7FE00C522B0 /* TopViewControllerInspector.swift */; }; D8832B1A2AF5000F00C522B0 /* TopViewControllerInspector.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8832B122AF4F7FE00C522B0 /* TopViewControllerInspector.swift */; }; D8832B1C2AF5101300C522B0 /* TopViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8832B1B2AF5101300C522B0 /* TopViewControllerTests.swift */; }; @@ -168,6 +176,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + D86B9C982CDD11430039211C /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -198,6 +207,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + D86B9C9B2CDD114E0039211C /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -219,6 +229,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + D86B9C9E2CDD115A0039211C /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -230,6 +241,7 @@ dstSubfolderSpec = 10; files = ( D8F71A832CDD04C200334022 /* (null) in Embed Frameworks */, + D86B9CA12CDD11670039211C /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -304,6 +316,10 @@ D845F35A27BAD4CC00A4D7A2 /* Person.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Person.xcdatamodel; sourceTree = ""; }; D85DAA49274C244F004DF43C /* iOS13-SwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "iOS13-SwiftTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; D85DAA4B274C244F004DF43C /* LaunchUITest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchUITest.swift; sourceTree = ""; }; + D86B9C962CDD11430039211C /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D86B9C992CDD114E0039211C /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D86B9C9C2CDD115A0039211C /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D86B9C9F2CDD11670039211C /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D8832B122AF4F7FE00C522B0 /* TopViewControllerInspector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopViewControllerInspector.swift; sourceTree = ""; }; D8832B192AF4FE2000C522B0 /* SentryUIApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryUIApplication.h; sourceTree = ""; }; D8832B1B2AF5101300C522B0 /* TopViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopViewControllerTests.swift; sourceTree = ""; }; @@ -347,6 +363,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D86B9C972CDD11430039211C /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -368,6 +385,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D86B9C9A2CDD114E0039211C /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -375,6 +393,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D86B9C9D2CDD115A0039211C /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -390,6 +409,7 @@ buildActionMask = 2147483647; files = ( D8F71A822CDD04C200334022 /* (null) in Frameworks */, + D86B9CA02CDD11670039211C /* Sentry.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -406,6 +426,10 @@ 634C7EC124406A4200AFDE9F /* Frameworks */ = { isa = PBXGroup; children = ( + D86B9C9F2CDD11670039211C /* Sentry.framework */, + D86B9C9C2CDD115A0039211C /* Sentry.framework */, + D86B9C992CDD114E0039211C /* Sentry.framework */, + D86B9C962CDD11430039211C /* Sentry.framework */, ); name = Frameworks; sourceTree = ""; From 34da34850afe360cab174c1a33b9b04f88042f58 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 16:17:44 +0100 Subject: [PATCH 19/28] Update project.pbxproj --- Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index cd87eb0f4b..1db74ab4c6 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -127,7 +127,6 @@ D8F71A5B2CDD03BB00334022 /* Base in Resources */ = {isa = PBXBuildFile; fileRef = D8F71A5A2CDD03BB00334022 /* Base */; }; D8F71A702CDD03BB00334022 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F71A6F2CDD03BB00334022 /* UITests.swift */; }; D8F71A822CDD04C200334022 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; - D8F71A832CDD04C200334022 /* (null) in Embed Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D8FD68C42C1C86E300A70055 /* TableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8FD68C32C1C86E300A70055 /* TableViewController.xib */; }; /* End PBXBuildFile section */ @@ -240,7 +239,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D8F71A832CDD04C200334022 /* (null) in Embed Frameworks */, D86B9CA12CDD11670039211C /* Sentry.framework in Embed Frameworks */, ); name = "Embed Frameworks"; From 8750307cd15cd2362300eb15d91da92fcdd8dfc2 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 16:25:41 +0100 Subject: [PATCH 20/28] Update project.pbxproj --- Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index 1db74ab4c6..54b0abdeab 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -88,6 +88,8 @@ D86B9C9E2CDD115A0039211C /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C9C2CDD115A0039211C /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D86B9CA02CDD11670039211C /* Sentry.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C9F2CDD11670039211C /* Sentry.framework */; }; D86B9CA12CDD11670039211C /* Sentry.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9C9F2CDD11670039211C /* Sentry.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D86B9CA32CDD136A0039211C /* SentrySwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9CA22CDD136A0039211C /* SentrySwiftUI.framework */; }; + D86B9CA42CDD136A0039211C /* SentrySwiftUI.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D86B9CA22CDD136A0039211C /* SentrySwiftUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; D8832B132AF4F7FE00C522B0 /* TopViewControllerInspector.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8832B122AF4F7FE00C522B0 /* TopViewControllerInspector.swift */; }; D8832B1A2AF5000F00C522B0 /* TopViewControllerInspector.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8832B122AF4F7FE00C522B0 /* TopViewControllerInspector.swift */; }; D8832B1C2AF5101300C522B0 /* TopViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8832B1B2AF5101300C522B0 /* TopViewControllerTests.swift */; }; @@ -207,6 +209,7 @@ dstSubfolderSpec = 10; files = ( D86B9C9B2CDD114E0039211C /* Sentry.framework in Embed Frameworks */, + D86B9CA42CDD136A0039211C /* SentrySwiftUI.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -318,6 +321,7 @@ D86B9C992CDD114E0039211C /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D86B9C9C2CDD115A0039211C /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D86B9C9F2CDD11670039211C /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D86B9CA22CDD136A0039211C /* SentrySwiftUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SentrySwiftUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D8832B122AF4F7FE00C522B0 /* TopViewControllerInspector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopViewControllerInspector.swift; sourceTree = ""; }; D8832B192AF4FE2000C522B0 /* SentryUIApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SentryUIApplication.h; sourceTree = ""; }; D8832B1B2AF5101300C522B0 /* TopViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopViewControllerTests.swift; sourceTree = ""; }; @@ -384,6 +388,7 @@ buildActionMask = 2147483647; files = ( D86B9C9A2CDD114E0039211C /* Sentry.framework in Frameworks */, + D86B9CA32CDD136A0039211C /* SentrySwiftUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -424,6 +429,7 @@ 634C7EC124406A4200AFDE9F /* Frameworks */ = { isa = PBXGroup; children = ( + D86B9CA22CDD136A0039211C /* SentrySwiftUI.framework */, D86B9C9F2CDD11670039211C /* Sentry.framework */, D86B9C9C2CDD115A0039211C /* Sentry.framework */, D86B9C992CDD114E0039211C /* Sentry.framework */, From ed445506d5035e68e26cfb47dada5d4a767f882b Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Thu, 7 Nov 2024 16:40:12 +0100 Subject: [PATCH 21/28] Update ui-tests.yml --- .github/workflows/ui-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 1e3c137af9..fb13ed0a92 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -119,7 +119,7 @@ jobs: - uses: actions/checkout@v4 - run: ./scripts/ci-select-xcode.sh "16.1" - name: Run Fastlane - run: fastlane ui_tests_ios_swift6 device:"iPhone 15 (17.2)" + run: fastlane ui_tests_ios_swift6 device:"iPhone 15" - name: Archiving Raw Test Logs uses: actions/upload-artifact@v4 From 626fe2a23b9eddd594a8fafe1fbd08dd673ad3f3 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Fri, 8 Nov 2024 09:24:49 +0100 Subject: [PATCH 22/28] Update ui-tests.yml --- .github/workflows/ui-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index fb13ed0a92..1e3c137af9 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -119,7 +119,7 @@ jobs: - uses: actions/checkout@v4 - run: ./scripts/ci-select-xcode.sh "16.1" - name: Run Fastlane - run: fastlane ui_tests_ios_swift6 device:"iPhone 15" + run: fastlane ui_tests_ios_swift6 device:"iPhone 15 (17.2)" - name: Archiving Raw Test Logs uses: actions/upload-artifact@v4 From 79a2e7b19babb20407eca879d515980b455f9ac2 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Fri, 8 Nov 2024 09:50:12 +0100 Subject: [PATCH 23/28] Update ui-tests.yml --- .github/workflows/ui-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 1e3c137af9..2f5467184c 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -117,9 +117,9 @@ jobs: steps: - uses: actions/checkout@v4 - - run: ./scripts/ci-select-xcode.sh "16.1" + - run: ./scripts/ci-select-xcode.sh "16.0" - name: Run Fastlane - run: fastlane ui_tests_ios_swift6 device:"iPhone 15 (17.2)" + run: fastlane ui_tests_ios_swift6 device:"iPhone 16" - name: Archiving Raw Test Logs uses: actions/upload-artifact@v4 From 1e141459d7479d33a4ce8a391c602c5d1d8433e9 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Fri, 8 Nov 2024 11:20:30 +0100 Subject: [PATCH 24/28] change fastlane --- .github/workflows/ui-tests.yml | 2 +- fastlane/Fastfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 2f5467184c..196ec58a19 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -119,7 +119,7 @@ jobs: - uses: actions/checkout@v4 - run: ./scripts/ci-select-xcode.sh "16.0" - name: Run Fastlane - run: fastlane ui_tests_ios_swift6 device:"iPhone 16" + run: fastlane ui_tests_ios_swift6 - name: Archiving Raw Test Logs uses: actions/upload-artifact@v4 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9c13c52595..27ae7b6a82 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -211,7 +211,6 @@ platform :ios do run_tests( workspace: "Sentry.xcworkspace", scheme: "iOS-Swift6", - device: options[:device], configuration: configuration ) end From 8f5ce31db4035279c1447ee24f781073508b37bc Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Fri, 8 Nov 2024 11:42:30 +0100 Subject: [PATCH 25/28] Update project.pbxproj --- .../iOS-Swift.xcodeproj/project.pbxproj | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index fbffbd7696..7ac7a748e0 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -1417,10 +1417,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; INFOPLIST_FILE = "iOS-Swift/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1430,6 +1432,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1631,10 +1634,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; INFOPLIST_FILE = "iOS-Swift/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1644,6 +1649,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1707,9 +1713,11 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS-SwiftClip/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift"; @@ -1728,6 +1736,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1863,10 +1872,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; INFOPLIST_FILE = "iOS-Swift/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1876,6 +1887,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1939,9 +1951,11 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS-SwiftClip/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift"; @@ -1960,6 +1974,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2109,9 +2124,11 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS-SwiftClip/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift"; @@ -2130,6 +2147,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; From 9b9d4c1781c4e72bec36c88f0aa3474cd93cfff2 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Fri, 8 Nov 2024 12:02:20 +0100 Subject: [PATCH 26/28] Update CHANGELOG.md --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5b7d7399b..b35ae12df6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Fixes - Keep PropagationContext when cloning scope (#4518) +- Concurrency crash with Swift 6 (#4512) ## 8.40.1 @@ -16,10 +17,6 @@ - Add extra logs for UIViewControllerSwizzling (#4511) -### Fixes - -- Concurrency crash with Swift 6 (#4512) - ## 8.40.0 ## Feature From 9b64e3b4a9618b32b1e26bdf57c6042ee9815f44 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Fri, 8 Nov 2024 12:08:01 +0100 Subject: [PATCH 27/28] Update project.pbxproj --- .../iOS-Swift.xcodeproj/project.pbxproj | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index 1c8ac2cda5..5d0c0fa21b 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -1455,7 +1455,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; @@ -1470,7 +1470,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1672,7 +1672,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; @@ -1687,7 +1687,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1751,7 +1751,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; @@ -1774,7 +1774,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1910,7 +1910,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = "iOS-Swift/iOS-Swift.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; @@ -1925,7 +1925,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1989,7 +1989,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; @@ -2012,7 +2012,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2162,7 +2162,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; @@ -2185,7 +2185,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift.Clip"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2199,9 +2199,11 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 97JCY7859U; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS-SwiftClip/Info.plist"; INFOPLIST_KEY_CFBundleDisplayName = "iOS-Swift"; @@ -2220,6 +2222,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; From 4529c3e729c69996aaee3740dfdef9d18bc1d9b9 Mon Sep 17 00:00:00 2001 From: Dhiogo Brustolin Date: Fri, 8 Nov 2024 13:51:15 +0100 Subject: [PATCH 28/28] Update project.pbxproj --- Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj index 5d0c0fa21b..e526e9c0b2 100644 --- a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj +++ b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj @@ -1470,7 +1470,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1687,7 +1687,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -1925,7 +1925,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match Development io.sentry.sample.iOS-Swift"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.*"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift"; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SUPPORTS_MACCATALYST = YES; SWIFT_OBJC_BRIDGING_HEADER = "iOS-Swift/Tools/iOS-Swift-Bridging-Header.h"; @@ -2199,7 +2199,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "iOS-SwiftClip/iOS_SwiftClip.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 97JCY7859U; @@ -2222,7 +2222,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "io.sentry.sample.iOS-Swift.Clip"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.sentry.sample.iOS-Swift.Clip"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.sentry.sample.iOS-Swift.Clip"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.sentry.sample.iOS-Swift.Clip"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2";