ci: ios swift xcodegen cleanup

.github/workflows/benchmarking.yml

@@ -11,7 +11,7 @@ on:
 
       # test changes to benchmarking implementation
       - "Samples/iOS-Swift/**"
-      - "Samples/iOS-Swift/iOS-Benchmarking/**"
+      - "Samples/iOS-Benchmarking/**"
       - ".github/workflows/benchmarking.yml"
       - ".sauce/benchmarking-config.yml"
       - "fastlane/**"
@@ -44,14 +44,14 @@ jobs:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app.dSYM
             DerivedData/Build/Products/Debug-iphoneos/iOS-Swift.app
-          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Swift/**') }}-${{ hashFiles('Sources/Sentry/**') }}
+          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/**') }}-${{ hashFiles('Sources/Sentry/**') }}
       - name: Cache iOS-Swift UI Test Runner App build product
         id: ios-swift-benchmark-runner-cache
         uses: actions/cache@v4
         with:
           path: |
             DerivedData/Build/Products/Debug-iphoneos/iOS-Benchmarking-Runner.app
-          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Swift/iOS-Benchmarking/**') }}
+          key: ios-swift-for-ui-testing-cache-key-${{ hashFiles('Samples/iOS-Benchmarking/**') }}
       - run: bundle exec fastlane build_ios_swift_for_tests
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}

.gitignore

@@ -226,6 +226,6 @@ dist
 .pnp.*
 
 Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.xcodeproj
-Samples/iOS-Swift_xcodegen.xcodeproj
-Samples/iOS-Swift6_xcodegen.xcodeproj
-Samples/iOS13-Swift_xcodegen.xcodeproj
+Samples/iOS-Swift/iOS-Swift.xcodeproj
+Samples/iOS-Swift6/iOS-Swift6.xcodeproj
+Samples/iOS13-Swift/iOS13-Swift.xcodeproj

Makefile

@@ -146,7 +146,7 @@ release-pod:
 
 xcode:
 	xcodegen --spec Samples/SessionReplay-CameraTest/SessionReplay-CameraTest.yml
-	xcodegen --spec Samples/iOS-Swift.yml
-	xcodegen --spec Samples/iOS-Swift6.yml
-	xcodegen --spec Samples/iOS13-Swift.yml
+	xcodegen --spec Samples/iOS-Swift/iOS-Swift.yml
+	xcodegen --spec Samples/iOS-Swift6/iOS-Swift6.yml
+	xcodegen --spec Samples/iOS13-Swift/iOS13-Swift.yml
 	open Sentry.xcworkspace

Plans/iOS-Benchmarking_Base.xctestplan

@@ -11,7 +11,7 @@
   "defaultOptions" : {
     "codeCoverage" : false,
     "targetForVariableExpansion" : {
-      "containerPath" : "container:iOS-Swift_xcodegen.xcodeproj",
+      "containerPath" : "container:iOS-Swift.xcodeproj",
       "identifier" : "637AFDA5243B02760034958B",
       "name" : "iOS-Swift"
     },
@@ -20,8 +20,8 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:iOS-Swift_xcodegen.xcodeproj",
-        "identifier" : "848A2560286E3351008A8858",
+        "containerPath" : "container:iOS-Swift.xcodeproj",
+        "identifier" : "E7C8F9BC5364F0980E0B827C",
         "name" : "iOS-Benchmarking"
       }
     }

Plans/iOS-Swift6_Base.xctestplan

@@ -14,8 +14,8 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:iOS-Swift6_xcodegen.xcodeproj",
-        "identifier" : "5A941B8BEFF8BABDD92A414A",
+        "containerPath" : "container:iOS-Swift6.xcodeproj",
+        "identifier" : "70F6260DD64A9D7AC4C7A53F",
         "name" : "iOS-Swift6-UITests"
       }
     }

Plans/iOS-Swift_Base.xctestplan

@@ -10,7 +10,7 @@
   ],
   "defaultOptions" : {
     "targetForVariableExpansion" : {
-      "containerPath" : "container:iOS-Swift_xcodegen.xcodeproj",
+      "containerPath" : "container:iOS-Swift.xcodeproj",
       "identifier" : "637AFDA5243B02760034958B",
       "name" : "iOS-Swift"
     },
@@ -19,8 +19,8 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:iOS-Swift_xcodegen.xcodeproj",
-        "identifier" : "7B64386726A6C544000D0F65",
+        "containerPath" : "container:iOS-Swift.xcodeproj",
+        "identifier" : "0217293F044A3AEED8E37A25",
         "name" : "iOS-Swift-UITests"
       }
     }

Plans/iOS13-Swift_Base.xctestplan

@@ -11,7 +11,7 @@
   "defaultOptions" : {
     "codeCoverage" : false,
     "targetForVariableExpansion" : {
-      "containerPath" : "container:iOS13-Swift_xcodegen.xcodeproj",
+      "containerPath" : "container:iOS13-Swift.xcodeproj",
       "identifier" : "D8269A38274C095E00BD5BD5",
       "name" : "iOS13-Swift"
     },
@@ -20,8 +20,8 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:iOS13-Swift_xcodegen.xcodeproj",
-        "identifier" : "876088591BAEBC4B16AB4795",
+        "containerPath" : "container:iOS13-Swift.xcodeproj",
+        "identifier" : "D09A2A83D1387A9EF644FA56",
         "name" : "iOS13-Swift-UITests"
       }
     }

Samples/iOS-Swift/iOS-Benchmarking.xcconfig

@@ -0,0 +1,38 @@
+#include "../Shared/Config/Architectures.xcconfig"
+#include "../Shared/Config/BuildOptions.xcconfig"
+#include "../Shared/Config/Deployment.xcconfig"
+#include "../Shared/Config/Linking.xcconfig"
+#include "../Shared/Config/Localization.xcconfig"
+#include "../Shared/Config/Packaging.xcconfig"
+#include "../Shared/Config/SearchPaths.xcconfig"
+#include "../Shared/Config/Signing.xcconfig"
+#include "../Shared/Config/Versioning.xcconfig"
+#include "../Shared/Config/CodeGeneration.xcconfig"
+#include "../Shared/Config/ClangLanguage.xcconfig"
+#include "../Shared/Config/ClangCppLanguage.xcconfig"
+#include "../Shared/Config/ClangModules.xcconfig"
+#include "../Shared/Config/ClangObjCLanguage.xcconfig"
+#include "../Shared/Config/ClangPreprocessing.xcconfig"
+#include "../Shared/Config/ClangWarnings.xcconfig"
+#include "../Shared/Config/ClangWarningsCpp.xcconfig"
+#include "../Shared/Config/ClangWarningsObjC.xcconfig"
+#include "../Shared/Config/AssetCatalog.xcconfig"
+#include "../Shared/Config/ClangAnalyzer.xcconfig"
+#include "../Shared/Config/Swift.xcconfig"
+#include "../Shared/Config/Metal.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-Benchmarking
+INFOPLIST_FILE = iOS-Benchmarking/Info.plist
+
+PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.iOS-Benchmarking.xctrunner
+PROVISIONING_PROFILE_SPECIFIER_Test =
+PROVISIONING_PROFILE_SPECIFIER_TestCI =
+PROVISIONING_PROFILE_SPECIFIER_Release =
+PROVISIONING_PROFILE_SPECIFIER = $(PROVISIONING_PROFILE_SPECIFIER_$(CONFIGURATION))
+PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
+
+CODE_SIGN_STYLE = Manual
+
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator
+
+TEST_TARGET_NAME = iOS-Swift

Samples/iOS-Swift/iOS-Swift-UITests.xcconfig

@@ -0,0 +1,37 @@
+#include "../Shared/Config/Architectures.xcconfig"
+#include "../Shared/Config/BuildOptions.xcconfig"
+#include "../Shared/Config/Deployment.xcconfig"
+#include "../Shared/Config/Linking.xcconfig"
+#include "../Shared/Config/Localization.xcconfig"
+#include "../Shared/Config/Packaging.xcconfig"
+#include "../Shared/Config/SearchPaths.xcconfig"
+#include "../Shared/Config/Signing.xcconfig"
+#include "../Shared/Config/Versioning.xcconfig"
+#include "../Shared/Config/CodeGeneration.xcconfig"
+#include "../Shared/Config/ClangLanguage.xcconfig"
+#include "../Shared/Config/ClangCppLanguage.xcconfig"
+#include "../Shared/Config/ClangModules.xcconfig"
+#include "../Shared/Config/ClangObjCLanguage.xcconfig"
+#include "../Shared/Config/ClangPreprocessing.xcconfig"
+#include "../Shared/Config/ClangWarnings.xcconfig"
+#include "../Shared/Config/ClangWarningsCpp.xcconfig"
+#include "../Shared/Config/ClangWarningsObjC.xcconfig"
+#include "../Shared/Config/AssetCatalog.xcconfig"
+#include "../Shared/Config/ClangAnalyzer.xcconfig"
+#include "../Shared/Config/Swift.xcconfig"
+#include "../Shared/Config/Metal.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = io.sentry.iOS-Swift-UITests
+
+PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.iOS-Swift-UITests.xctrunner
+PROVISIONING_PROFILE_SPECIFIER_Test = match Development io.sentry.iOS-Swift-UITests.xctrunner
+PROVISIONING_PROFILE_SPECIFIER_TestCI = match Development io.sentry.iOS-Swift-UITests.xctrunner
+PROVISIONING_PROFILE_SPECIFIER_Release = match AppStore io.sentry.iOS-Swift-UITests.xctrunner
+PROVISIONING_PROFILE_SPECIFIER = $(PROVISIONING_PROFILE_SPECIFIER_$(CONFIGURATION))
+PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
+
+CODE_SIGN_STYLE = Manual
+
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator
+
+TEST_TARGET_NAME = iOS-Swift

Samples/iOS-Swift/iOS-Swift.xcconfig

@@ -0,0 +1,39 @@
+#include "../Shared/Config/Architectures.xcconfig"
+#include "../Shared/Config/BuildOptions.xcconfig"
+#include "../Shared/Config/Deployment.xcconfig"
+#include "../Shared/Config/Linking.xcconfig"
+#include "../Shared/Config/Localization.xcconfig"
+#include "../Shared/Config/Packaging.xcconfig"
+#include "../Shared/Config/SearchPaths.xcconfig"
+#include "../Shared/Config/Signing.xcconfig"
+#include "../Shared/Config/Versioning.xcconfig"
+#include "../Shared/Config/CodeGeneration.xcconfig"
+#include "../Shared/Config/ClangLanguage.xcconfig"
+#include "../Shared/Config/ClangCppLanguage.xcconfig"
+#include "../Shared/Config/ClangModules.xcconfig"
+#include "../Shared/Config/ClangObjCLanguage.xcconfig"
+#include "../Shared/Config/ClangPreprocessing.xcconfig"
+#include "../Shared/Config/ClangWarnings.xcconfig"
+#include "../Shared/Config/ClangWarningsCpp.xcconfig"
+#include "../Shared/Config/ClangWarningsObjC.xcconfig"
+#include "../Shared/Config/AssetCatalog.xcconfig"
+#include "../Shared/Config/ClangAnalyzer.xcconfig"
+#include "../Shared/Config/Swift.xcconfig"
+#include "../Shared/Config/Metal.xcconfig"
+
+PRODUCT_BUNDLE_IDENTIFIER = io.sentry.sample.iOS-Swift
+INFOPLIST_FILE = iOS-Swift/Info.plist
+CODE_SIGN_ENTITLEMENTS = iOS-Swift/iOS-Swift.entitlements
+
+PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.sample.iOS-Swift
+PROVISIONING_PROFILE_SPECIFIER_Test = match Development io.sentry.sample.iOS-Swift
+PROVISIONING_PROFILE_SPECIFIER_TestCI = match Development io.sentry.sample.iOS-Swift
+PROVISIONING_PROFILE_SPECIFIER_Release = match AppStore io.sentry.sample.iOS-Swift
+PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*] = $(PROVISIONING_PROFILE_SPECIFIER_$(CONFIGURATION))
+PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] =
+
+CODE_SIGN_STYLE = Manual
+
+SWIFT_OBJC_BRIDGING_HEADER = iOS-Swift/Tools/iOS-Swift-Bridging-Header.h
+
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator