cleanup

philprime · philprime · commit 9c83007f1577 · 2025-11-07T13:41:17.000+01:00
diff --git a/Samples/iOS-Swift/iOS-Swift-ActionExtension/Sources/ActionViewController.swift b/Samples/iOS-Swift/iOS-Swift-ActionExtension/Sources/ActionViewController.swift
@@ -17,6 +17,12 @@ class ActionViewController: UIViewController {
     }
 
     private func setupSentry() {
+        // Prevent double initialization - SentrySDK.start() can be called multiple times
+        // but we want to avoid unnecessary re-initialization
+        guard !SentrySDK.isEnabled else {
+            return
+        }
+
         // For this extension we need a specific configuration set, therefore we do not use the shared sample initializer
         SentrySDK.start { options in
             options.dsn = SentrySDKWrapper.defaultDSN
diff --git a/Samples/iOS-Swift/iOS-Swift-IntentExtension/Sources/IntentHandler.swift b/Samples/iOS-Swift/iOS-Swift-IntentExtension/Sources/IntentHandler.swift
@@ -16,6 +16,12 @@ class IntentHandler: INExtension, INSendMessageIntentHandling {
     }
 
     private func setupSentry() {
+        // Prevent double initialization - SentrySDK.start() can be called multiple times
+        // but we want to avoid unnecessary re-initialization
+        guard !SentrySDK.isEnabled else {
+            return
+        }
+        
         // For this extension we need a specific configuration set, therefore we do not use the shared sample initializer
         SentrySDK.start { options in
             options.dsn = SentrySDKWrapper.defaultDSN
diff --git a/Samples/iOS-Swift/iOS-Swift-ShareExtension.xcconfig b/Samples/iOS-Swift/iOS-Swift-ShareExtension.xcconfig
@@ -14,5 +14,7 @@ CODE_SIGN_STYLE = Manual
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator
 
+SWIFT_OBJC_BRIDGING_HEADER = iOS-Swift/Tools/iOS-Swift-Bridging-Header.h
+
 // Runtime search paths for app extensions to find frameworks in parent app
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
diff --git a/Samples/iOS-Swift/iOS-Swift-ShareExtension/Sources/ShareViewController.swift b/Samples/iOS-Swift/iOS-Swift-ShareExtension/Sources/ShareViewController.swift
@@ -16,6 +16,12 @@ class ShareViewController: SLComposeServiceViewController {
     }
 
     private func setupSentry() {
+        // Prevent double initialization - SentrySDK.start() can be called multiple times
+        // but we want to avoid unnecessary re-initialization
+        guard !SentrySDK.isEnabled else {
+            return
+        }
+
         // For this extension we need a specific configuration set, therefore we do not use the shared sample initializer
         SentrySDK.start { options in
             options.dsn = SentrySDKWrapper.defaultDSN
diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj b/Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj
diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift-ActionExtension.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift-ActionExtension.xcscheme
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1430"
-   wasCreatedForAppExtension = "YES"
-   version = "2.0">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5B05A31890F168B2E9851B98"
-               BuildableName = "iOS-Swift-ActionExtension.appex"
-               BlueprintName = "iOS-Swift-ActionExtension"
+               BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+               BuildableName = "iOS-Swift.app"
+               BlueprintName = "iOS-Swift"
                ReferencedContainer = "container:iOS-Swift.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,9 +29,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
-               BuildableName = "iOS-Swift.app"
-               BlueprintName = "iOS-Swift"
+               BlueprintIdentifier = "5B05A31890F168B2E9851B98"
+               BuildableName = "iOS-Swift-ActionExtension.appex"
+               BlueprintName = "iOS-Swift-ActionExtension"
                ReferencedContainer = "container:iOS-Swift.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -41,13 +41,14 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "NO">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5B05A31890F168B2E9851B98"
-            BuildableName = "iOS-Swift-ActionExtension.appex"
-            BlueprintName = "iOS-Swift-ActionExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -56,25 +57,26 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
-      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <MacroExpansion>
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5B05A31890F168B2E9851B98"
-            BuildableName = "iOS-Swift-ActionExtension.appex"
-            BlueprintName = "iOS-Swift-ActionExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -86,9 +88,9 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5B05A31890F168B2E9851B98"
-            BuildableName = "iOS-Swift-ActionExtension.appex"
-            BlueprintName = "iOS-Swift-ActionExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift-IntentExtension.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift-IntentExtension.xcscheme
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1430"
-   wasCreatedForAppExtension = "YES"
-   version = "2.0">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5DB3F50F9D50D2F2419F11F3"
-               BuildableName = "iOS-Swift-IntentExtension.appex"
-               BlueprintName = "iOS-Swift-IntentExtension"
+               BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+               BuildableName = "iOS-Swift.app"
+               BlueprintName = "iOS-Swift"
                ReferencedContainer = "container:iOS-Swift.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,9 +29,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
-               BuildableName = "iOS-Swift.app"
-               BlueprintName = "iOS-Swift"
+               BlueprintIdentifier = "5DB3F50F9D50D2F2419F11F3"
+               BuildableName = "iOS-Swift-IntentExtension.appex"
+               BlueprintName = "iOS-Swift-IntentExtension"
                ReferencedContainer = "container:iOS-Swift.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -41,13 +41,14 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "NO">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5DB3F50F9D50D2F2419F11F3"
-            BuildableName = "iOS-Swift-IntentExtension.appex"
-            BlueprintName = "iOS-Swift-IntentExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -56,25 +57,26 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
-      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <MacroExpansion>
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5DB3F50F9D50D2F2419F11F3"
-            BuildableName = "iOS-Swift-IntentExtension.appex"
-            BlueprintName = "iOS-Swift-IntentExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -86,9 +88,9 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5DB3F50F9D50D2F2419F11F3"
-            BuildableName = "iOS-Swift-IntentExtension.appex"
-            BlueprintName = "iOS-Swift-IntentExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
diff --git a/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift-ShareExtension.xcscheme b/Samples/iOS-Swift/iOS-Swift.xcodeproj/xcshareddata/xcschemes/iOS-Swift-ShareExtension.xcscheme
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1430"
-   wasCreatedForAppExtension = "YES"
-   version = "2.0">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,9 +15,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "C97FF7E8B34B54F1E1DA596E"
-               BuildableName = "iOS-Swift-ShareExtension.appex"
-               BlueprintName = "iOS-Swift-ShareExtension"
+               BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+               BuildableName = "iOS-Swift.app"
+               BlueprintName = "iOS-Swift"
                ReferencedContainer = "container:iOS-Swift.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,9 +29,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
-               BuildableName = "iOS-Swift.app"
-               BlueprintName = "iOS-Swift"
+               BlueprintIdentifier = "C97FF7E8B34B54F1E1DA596E"
+               BuildableName = "iOS-Swift-ShareExtension.appex"
+               BlueprintName = "iOS-Swift-ShareExtension"
                ReferencedContainer = "container:iOS-Swift.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -41,13 +41,14 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "NO">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C97FF7E8B34B54F1E1DA596E"
-            BuildableName = "iOS-Swift-ShareExtension.appex"
-            BlueprintName = "iOS-Swift-ShareExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -56,30 +57,26 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
-      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <RemoteRunnable
-         runnableDebuggingMode = "0"
-         BundleIdentifier = "com.apple.mobilesafari"
-         RemotePath = "/var/containers/Bundle/Application/DDE4BAF9-2C7E-4698-BC7F-621715D2A745/MobileSafari.app">
-      </RemoteRunnable>
-      <MacroExpansion>
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C97FF7E8B34B54F1E1DA596E"
-            BuildableName = "iOS-Swift-ShareExtension.appex"
-            BlueprintName = "iOS-Swift-ShareExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -91,9 +88,9 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C97FF7E8B34B54F1E1DA596E"
-            BuildableName = "iOS-Swift-ShareExtension.appex"
-            BlueprintName = "iOS-Swift-ShareExtension"
+            BlueprintIdentifier = "6C5B85CBF6AE4AA020E28E5F"
+            BuildableName = "iOS-Swift.app"
+            BlueprintName = "iOS-Swift"
             ReferencedContainer = "container:iOS-Swift.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
diff --git a/Samples/iOS-Swift/iOS-Swift.yml b/Samples/iOS-Swift/iOS-Swift.yml
