diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml index ee1bd6519b3..cfeb3f7cf01 100644 --- a/.github/workflows/benchmarking.yml +++ b/.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 }} diff --git a/.gitignore b/.gitignore index 350b08b26e6..2d394c51c2d 100644 --- a/.gitignore +++ b/.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 diff --git a/Makefile b/Makefile index b2c23247fa8..2e14488617b 100644 --- a/Makefile +++ b/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 diff --git a/Plans/iOS-Benchmarking_Base.xctestplan b/Plans/iOS-Benchmarking_Base.xctestplan index 8dd05b51065..91486111c0e 100644 --- a/Plans/iOS-Benchmarking_Base.xctestplan +++ b/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" } } diff --git a/Plans/iOS-Swift6_Base.xctestplan b/Plans/iOS-Swift6_Base.xctestplan index 4465c3c0e2e..1d9315a80cb 100644 --- a/Plans/iOS-Swift6_Base.xctestplan +++ b/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" } } diff --git a/Plans/iOS-Swift_Base.xctestplan b/Plans/iOS-Swift_Base.xctestplan index 7788393304f..e655382762d 100644 --- a/Plans/iOS-Swift_Base.xctestplan +++ b/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" } } diff --git a/Plans/iOS13-Swift_Base.xctestplan b/Plans/iOS13-Swift_Base.xctestplan index a8dc47fef94..5b444324151 100644 --- a/Plans/iOS13-Swift_Base.xctestplan +++ b/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" } } diff --git a/Samples/iOS-Benchmarking.xcconfig b/Samples/iOS-Benchmarking.xcconfig deleted file mode 100644 index a68e83f1b2c..00000000000 --- a/Samples/iOS-Benchmarking.xcconfig +++ /dev/null @@ -1,38 +0,0 @@ -#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-Swift/iOS-Benchmarking/Info.plist - -PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.iOS-Benchmarking.xctrunner -PROVISIONING_PROFILE_SPECIFIER_Test = match Development io.sentry.iOS-Benchmarking.xctrunner -PROVISIONING_PROFILE_SPECIFIER_TestCI = match Development io.sentry.iOS-Benchmarking.xctrunner -PROVISIONING_PROFILE_SPECIFIER_Release = match AppStore io.sentry.iOS-Benchmarking.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 diff --git a/Samples/iOS-Swift-UITests.xcconfig b/Samples/iOS-Swift-UITests.xcconfig deleted file mode 100644 index 20caaaef1e0..00000000000 --- a/Samples/iOS-Swift-UITests.xcconfig +++ /dev/null @@ -1,37 +0,0 @@ -#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 diff --git a/Samples/iOS-Swift.xcconfig b/Samples/iOS-Swift.xcconfig deleted file mode 100644 index 421b4b4af20..00000000000 --- a/Samples/iOS-Swift.xcconfig +++ /dev/null @@ -1,39 +0,0 @@ -#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/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/iOS-Swift/Tools/iOS-Swift-Bridging-Header.h - -SUPPORTED_PLATFORMS = iphoneos iphonesimulator diff --git a/Samples/iOS-Swift/iOS-Benchmarking.xcconfig b/Samples/iOS-Swift/iOS-Benchmarking.xcconfig new file mode 100644 index 00000000000..2d668da69a2 --- /dev/null +++ b/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 diff --git a/Samples/iOS-Swift/iOS-Swift-UITests.xcconfig b/Samples/iOS-Swift/iOS-Swift-UITests.xcconfig new file mode 100644 index 00000000000..a9f6f257acb --- /dev/null +++ b/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 diff --git a/Samples/iOS-Swift/iOS-Swift.xcconfig b/Samples/iOS-Swift/iOS-Swift.xcconfig new file mode 100644 index 00000000000..5b5a7bac2f8 --- /dev/null +++ b/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 diff --git a/Samples/iOS-Swift.yml b/Samples/iOS-Swift/iOS-Swift.yml similarity index 83% rename from Samples/iOS-Swift.yml rename to Samples/iOS-Swift/iOS-Swift.yml index 05794c6ddd3..c5b7728c3f9 100644 --- a/Samples/iOS-Swift.yml +++ b/Samples/iOS-Swift/iOS-Swift.yml @@ -1,4 +1,4 @@ -name: iOS-Swift_xcodegen +name: iOS-Swift createIntermediateGroups: true generateEmptyDirectories: true configs: @@ -8,12 +8,12 @@ configs: Release: release projectReferences: Sentry: - path: ../Sentry.xcodeproj + path: ../../Sentry.xcodeproj fileGroups: - - Shared/Config + - ../Shared/Config - iOS-Swift.yml - - ../Plans/iOS-Swift_Base.xctestplan - - ../Plans/iOS-Benchmarking_Base.xctestplan + - ../../Plans/iOS-Swift_Base.xctestplan + - ../../Plans/iOS-Benchmarking_Base.xctestplan options: bundleIdPrefix: io.sentry targets: @@ -21,18 +21,18 @@ targets: type: application platform: auto sources: - - iOS-Swift/iOS-Swift - - Shared/GitInjections.swift - - Shared/DSNStorage.swift - - Shared/SpanExtension.swift - - Shared/UIViewControllerExtension.swift - - Shared/UIViewExtension.swift - - Shared/RandomErrors.swift - - Shared/SpanObserver.swift - - Shared/UIAssert.swift - - Shared/AssertView.swift - - Shared/screenshot.png - - Shared/SampleAssets.xcassets + - iOS-Swift + - ../Shared/GitInjections.swift + - ../Shared/DSNStorage.swift + - ../Shared/SpanExtension.swift + - ../Shared/UIViewControllerExtension.swift + - ../Shared/UIViewExtension.swift + - ../Shared/RandomErrors.swift + - ../Shared/SpanObserver.swift + - ../Shared/UIAssert.swift + - ../Shared/AssertView.swift + - ../Shared/screenshot.png + - ../Shared/SampleAssets.xcassets dependencies: - target: Sentry/Sentry - target: iOS-SwiftClip @@ -42,21 +42,21 @@ targets: Test: iOS-Swift.xcconfig TestCI: iOS-Swift.xcconfig postCompileScripts: - - script: Shared/inject-git-info.sh + - script: ../Shared/inject-git-info.sh name: Inject Git Information into Info.plist basedOnDependencyAnalysis: false postBuildScripts: - - script: Shared/reset-git-info.sh + - script: ../Shared/reset-git-info.sh name: Reset Git Fields in Info.plist basedOnDependencyAnalysis: false iOS-SwiftClip: type: application.on-demand-install-capable platform: auto sources: - - iOS-Swift/iOS-SwiftClip - - Shared/GitInjections.swift - - Shared/DSNStorage.swift - - Shared/screenshot.png + - iOS-SwiftClip + - ../Shared/GitInjections.swift + - ../Shared/DSNStorage.swift + - ../Shared/screenshot.png dependencies: - target: Sentry/Sentry configFiles: @@ -65,18 +65,18 @@ targets: Test: iOS-SwiftClip.xcconfig TestCI: iOS-SwiftClip.xcconfig postCompileScripts: - - script: Shared/inject-git-info.sh + - script: ../Shared/inject-git-info.sh name: Inject Git Information into Info.plist basedOnDependencyAnalysis: false postBuildScripts: - - script: Shared/reset-git-info.sh + - script: ../Shared/reset-git-info.sh name: Reset Git Fields in Info.plist basedOnDependencyAnalysis: false iOS-Swift-UITests: type: bundle.ui-testing platform: auto sources: - - iOS-Swift/iOS-Swift-UITests + - iOS-Swift-UITests configFiles: Debug: iOS-Swift-UITests.xcconfig Release: iOS-Swift-UITests.xcconfig @@ -86,7 +86,7 @@ targets: type: bundle.ui-testing platform: auto sources: - - iOS-Swift/iOS-Benchmarking + - iOS-Benchmarking configFiles: Debug: iOS-Benchmarking.xcconfig Release: iOS-Benchmarking.xcconfig @@ -178,7 +178,7 @@ schemes: test: config: Test testPlans: - - path: ../Plans/iOS-Swift_Base.xctestplan + - path: ../../Plans/iOS-Swift_Base.xctestplan iOS-Benchmarking: build: targets: @@ -187,4 +187,4 @@ schemes: test: config: Release testPlans: - - path: ../Plans/iOS-Benchmarking_Base.xctestplan + - path: ../../Plans/iOS-Benchmarking_Base.xctestplan diff --git a/Samples/iOS-Swift/iOS-Swift/LoremIpsum.txt b/Samples/iOS-Swift/iOS-Swift/LoremIpsum.txt index c3fde095083..55cbd23de3c 100644 --- a/Samples/iOS-Swift/iOS-Swift/LoremIpsum.txt +++ b/Samples/iOS-Swift/iOS-Swift/LoremIpsum.txt @@ -10017,4 +10017,3 @@ Nulla consectetur ut nisi et maximus. Integer dapibus nisl quis mattis commodo. Cras erat lectus, interdum eu elit id, condimentum imperdiet velit. Pellentesque auctor orci enim, in tincidunt sapien fringilla id. Maecenas sit amet eros id metus porttitor lobortis. Maecenas tellus nunc, varius vitae dignissim nec, dapibus ac lacus. Morbi pulvinar eget felis eu hendrerit. Sed vel dui varius, pellentesque nisi nec, lacinia magna. Ut eget lorem imperdiet, gravida turpis ut, egestas tellus. Curabitur ac ex nec metus facilisis pretium et at turpis. Praesent vitae sapien elementum, sagittis ex ut, fermentum orci. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse semper eleifend pulvinar. Interdum et malesuada fames ac ante ipsum primis in faucibus. Cras nec nisl sapien. Fusce sit amet nisi ultrices, pellentesque dui non, condimentum massa. Ut in orci vel metus suscipit feugiat. Nullam eu nulla pulvinar, ullamcorper tellus nec, scelerisque orci. Donec in enim id quam interdum suscipit. Vestibulum a sagittis quam, nec suscipit purus. Sed eleifend diam lacinia, cursus ante eget, aliquet quam. Vivamus scelerisque ipsum ex, eu efficitur libero maximus id. Maecenas est diam, tempus placerat odio nec, tincidunt fringilla mi. Fusce condimentum ante sapien, in dignissim diam malesuada at. Mauris a dui eget orci laoreet consectetur biam. - diff --git a/Samples/iOS-Swift/iOS-Swift/SentryData.xcdatamodeld/Person.xcdatamodel/contents b/Samples/iOS-Swift/iOS-Swift/SentryData.xcdatamodeld/Person.xcdatamodel/contents index 0d1c727289f..39a0d0305a3 100644 --- a/Samples/iOS-Swift/iOS-Swift/SentryData.xcdatamodeld/Person.xcdatamodel/contents +++ b/Samples/iOS-Swift/iOS-Swift/SentryData.xcdatamodeld/Person.xcdatamodel/contents @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/Samples/iOS-Swift/iOS-SwiftClip.xcconfig b/Samples/iOS-Swift/iOS-SwiftClip.xcconfig new file mode 100644 index 00000000000..774b7e95b53 --- /dev/null +++ b/Samples/iOS-Swift/iOS-SwiftClip.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.Clip +INFOPLIST_FILE = iOS-SwiftClip/Info.plist +CODE_SIGN_ENTITLEMENTS = iOS-SwiftClip/iOS_SwiftClip.entitlements + +PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.sample.iOS-Swift.Clip +PROVISIONING_PROFILE_SPECIFIER_Test = match Development io.sentry.sample.iOS-Swift.Clip +PROVISIONING_PROFILE_SPECIFIER_TestCI = match Development io.sentry.sample.iOS-Swift.Clip +PROVISIONING_PROFILE_SPECIFIER_Release = match AppStore io.sentry.sample.iOS-Swift.Clip +PROVISIONING_PROFILE_SPECIFIER = $(PROVISIONING_PROFILE_SPECIFIER_$(CONFIGURATION)) +PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = + +CODE_SIGN_STYLE = Manual + +SUPPORTED_PLATFORMS = iphoneos iphonesimulator + +IPHONEOS_DEPLOYMENT_TARGET = 14.0 diff --git a/Samples/iOS-Swift/iOS-SwiftClip/iOS_SwiftClip.entitlements b/Samples/iOS-Swift/iOS-SwiftClip/iOS_SwiftClip.entitlements index ee320308917..2580cdbb52a 100644 --- a/Samples/iOS-Swift/iOS-SwiftClip/iOS_SwiftClip.entitlements +++ b/Samples/iOS-Swift/iOS-SwiftClip/iOS_SwiftClip.entitlements @@ -7,4 +7,4 @@ $(AppIdentifierPrefix)io.sentry.sample.iOS-Swift - \ No newline at end of file + diff --git a/Samples/iOS-Swift6-UITests.xcconfig b/Samples/iOS-Swift6-UITests.xcconfig deleted file mode 100644 index 07dffda6377..00000000000 --- a/Samples/iOS-Swift6-UITests.xcconfig +++ /dev/null @@ -1,28 +0,0 @@ -#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-Swift6-UITests - -SUPPORTED_PLATFORMS = iphoneos iphonesimulator - -TEST_TARGET_NAME = iOS-Swift6 diff --git a/Samples/iOS-Swift6.xcconfig b/Samples/iOS-Swift6.xcconfig deleted file mode 100644 index ba3ea26667e..00000000000 --- a/Samples/iOS-Swift6.xcconfig +++ /dev/null @@ -1,27 +0,0 @@ -#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-Swift6 -INFOPLIST_FILE = iOS-Swift6/Info.plist -SUPPORTED_PLATFORMS = iphoneos iphonesimulator -SWIFT_VERSION = 6 diff --git a/Samples/iOS-Swift6/iOS-Swift6-UITests.xcconfig b/Samples/iOS-Swift6/iOS-Swift6-UITests.xcconfig new file mode 100644 index 00000000000..f8ccfbc5983 --- /dev/null +++ b/Samples/iOS-Swift6/iOS-Swift6-UITests.xcconfig @@ -0,0 +1,28 @@ +#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-Swift6-UITests + +SUPPORTED_PLATFORMS = iphoneos iphonesimulator + +TEST_TARGET_NAME = iOS-Swift6 diff --git a/Samples/iOS-Swift6-UITests/Info.plist b/Samples/iOS-Swift6/iOS-Swift6-UITests/Info.plist similarity index 100% rename from Samples/iOS-Swift6-UITests/Info.plist rename to Samples/iOS-Swift6/iOS-Swift6-UITests/Info.plist diff --git a/Samples/iOS-Swift6-UITests/UITests.swift b/Samples/iOS-Swift6/iOS-Swift6-UITests/UITests.swift similarity index 100% rename from Samples/iOS-Swift6-UITests/UITests.swift rename to Samples/iOS-Swift6/iOS-Swift6-UITests/UITests.swift diff --git a/Samples/iOS-Swift6/iOS-Swift6.xcconfig b/Samples/iOS-Swift6/iOS-Swift6.xcconfig new file mode 100644 index 00000000000..1e6fc0636e8 --- /dev/null +++ b/Samples/iOS-Swift6/iOS-Swift6.xcconfig @@ -0,0 +1,27 @@ +#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-Swift6 +INFOPLIST_FILE = iOS-Swift6/Info.plist +SUPPORTED_PLATFORMS = iphoneos iphonesimulator +SWIFT_VERSION = 6 diff --git a/Samples/iOS-Swift6.yml b/Samples/iOS-Swift6/iOS-Swift6.yml similarity index 76% rename from Samples/iOS-Swift6.yml rename to Samples/iOS-Swift6/iOS-Swift6.yml index 03416b3986b..e2de1af6817 100644 --- a/Samples/iOS-Swift6.yml +++ b/Samples/iOS-Swift6/iOS-Swift6.yml @@ -1,4 +1,4 @@ -name: iOS-Swift6_xcodegen +name: iOS-Swift6 createIntermediateGroups: true generateEmptyDirectories: true configs: @@ -8,11 +8,11 @@ configs: Release: release projectReferences: Sentry: - path: ../Sentry.xcodeproj + path: ../../Sentry.xcodeproj fileGroups: - - Shared/Config + - ../Shared/Config - iOS-Swift6.yml - - ../Plans/iOS-Swift6_Base.xctestplan + - ../../Plans/iOS-Swift6_Base.xctestplan options: bundleIdPrefix: io.sentry targets: @@ -21,9 +21,9 @@ targets: platform: auto sources: - iOS-Swift6 - - Shared/GitInjections.swift - - Shared/screenshot.png - - Shared/SampleAssets.xcassets + - ../Shared/GitInjections.swift + - ../Shared/screenshot.png + - ../Shared/SampleAssets.xcassets dependencies: - target: Sentry/Sentry configFiles: @@ -32,11 +32,11 @@ targets: Test: iOS-Swift6.xcconfig TestCI: iOS-Swift6.xcconfig postCompileScripts: - - script: Shared/inject-git-info.sh + - script: ../Shared/inject-git-info.sh name: Inject Git Information into Info.plist basedOnDependencyAnalysis: false postBuildScripts: - - script: Shared/reset-git-info.sh + - script: ../Shared/reset-git-info.sh name: Reset Git Fields in Info.plist basedOnDependencyAnalysis: false iOS-Swift6-UITests: @@ -58,4 +58,4 @@ schemes: test: config: Test testPlans: - - path: ../Plans/iOS-Swift6_Base.xctestplan + - path: ../../Plans/iOS-Swift6_Base.xctestplan diff --git a/Samples/iOS-Swift6/AppDelegate.swift b/Samples/iOS-Swift6/iOS-Swift6/AppDelegate.swift similarity index 100% rename from Samples/iOS-Swift6/AppDelegate.swift rename to Samples/iOS-Swift6/iOS-Swift6/AppDelegate.swift diff --git a/Samples/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json b/Samples/iOS-Swift6/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from Samples/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json rename to Samples/iOS-Swift6/iOS-Swift6/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/Samples/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json b/Samples/iOS-Swift6/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Samples/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Samples/iOS-Swift6/iOS-Swift6/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Samples/iOS-Swift6/Assets.xcassets/Contents.json b/Samples/iOS-Swift6/iOS-Swift6/Assets.xcassets/Contents.json similarity index 100% rename from Samples/iOS-Swift6/Assets.xcassets/Contents.json rename to Samples/iOS-Swift6/iOS-Swift6/Assets.xcassets/Contents.json diff --git a/Samples/iOS-Swift6/Base.lproj/LaunchScreen.storyboard b/Samples/iOS-Swift6/iOS-Swift6/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from Samples/iOS-Swift6/Base.lproj/LaunchScreen.storyboard rename to Samples/iOS-Swift6/iOS-Swift6/Base.lproj/LaunchScreen.storyboard diff --git a/Samples/iOS-Swift6/Base.lproj/Main.storyboard b/Samples/iOS-Swift6/iOS-Swift6/Base.lproj/Main.storyboard similarity index 100% rename from Samples/iOS-Swift6/Base.lproj/Main.storyboard rename to Samples/iOS-Swift6/iOS-Swift6/Base.lproj/Main.storyboard diff --git a/Samples/iOS-Swift6/Info.plist b/Samples/iOS-Swift6/iOS-Swift6/Info.plist similarity index 100% rename from Samples/iOS-Swift6/Info.plist rename to Samples/iOS-Swift6/iOS-Swift6/Info.plist diff --git a/Samples/iOS-Swift6/SceneDelegate.swift b/Samples/iOS-Swift6/iOS-Swift6/SceneDelegate.swift similarity index 100% rename from Samples/iOS-Swift6/SceneDelegate.swift rename to Samples/iOS-Swift6/iOS-Swift6/SceneDelegate.swift diff --git a/Samples/iOS-Swift6/ViewController.swift b/Samples/iOS-Swift6/iOS-Swift6/ViewController.swift similarity index 100% rename from Samples/iOS-Swift6/ViewController.swift rename to Samples/iOS-Swift6/iOS-Swift6/ViewController.swift diff --git a/Samples/iOS-SwiftClip.xcconfig b/Samples/iOS-SwiftClip.xcconfig deleted file mode 100644 index 890f50f7583..00000000000 --- a/Samples/iOS-SwiftClip.xcconfig +++ /dev/null @@ -1,39 +0,0 @@ -#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.Clip -INFOPLIST_FILE = iOS-Swift/iOS-SwiftClip/Info.plist -CODE_SIGN_ENTITLEMENTS = iOS-Swift/iOS-SwiftClip/iOS_SwiftClip.entitlements - -PROVISIONING_PROFILE_SPECIFIER_Debug = match Development io.sentry.sample.iOS-Swift.Clip -PROVISIONING_PROFILE_SPECIFIER_Test = match Development io.sentry.sample.iOS-Swift.Clip -PROVISIONING_PROFILE_SPECIFIER_TestCI = match Development io.sentry.sample.iOS-Swift.Clip -PROVISIONING_PROFILE_SPECIFIER_Release = match AppStore io.sentry.sample.iOS-Swift.Clip -PROVISIONING_PROFILE_SPECIFIER = $(PROVISIONING_PROFILE_SPECIFIER_$(CONFIGURATION)) -PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*] = - -CODE_SIGN_STYLE = Manual - -SUPPORTED_PLATFORMS = iphoneos iphonesimulator - -IPHONEOS_DEPLOYMENT_TARGET = 14.0 diff --git a/Samples/iOS13-Swift-UITests.xcconfig b/Samples/iOS13-Swift-UITests.xcconfig deleted file mode 100644 index 47f6200ac6a..00000000000 --- a/Samples/iOS13-Swift-UITests.xcconfig +++ /dev/null @@ -1,28 +0,0 @@ -#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.iOS13-Swift-UITests - -SUPPORTED_PLATFORMS = iphoneos iphonesimulator - -TEST_TARGET_NAME = iOS13-Swift diff --git a/Samples/iOS13-Swift.xcconfig b/Samples/iOS13-Swift.xcconfig deleted file mode 100644 index eb2c28e31f3..00000000000 --- a/Samples/iOS13-Swift.xcconfig +++ /dev/null @@ -1,26 +0,0 @@ -#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.iOS13-Swift -INFOPLIST_FILE = iOS-Swift/iOS13-Swift/Info.plist -SUPPORTED_PLATFORMS = iphoneos iphonesimulator diff --git a/Samples/iOS13-Swift/iOS13-Swift-UITests.xcconfig b/Samples/iOS13-Swift/iOS13-Swift-UITests.xcconfig new file mode 100644 index 00000000000..84b9f429da0 --- /dev/null +++ b/Samples/iOS13-Swift/iOS13-Swift-UITests.xcconfig @@ -0,0 +1,28 @@ +#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.iOS13-Swift-UITests + +SUPPORTED_PLATFORMS = iphoneos iphonesimulator + +TEST_TARGET_NAME = iOS13-Swift diff --git a/Samples/iOS13-Swift-UITests/Info.plist b/Samples/iOS13-Swift/iOS13-Swift-UITests/Info.plist similarity index 100% rename from Samples/iOS13-Swift-UITests/Info.plist rename to Samples/iOS13-Swift/iOS13-Swift-UITests/Info.plist diff --git a/Samples/iOS13-Swift-UITests/LaunchUITest.swift b/Samples/iOS13-Swift/iOS13-Swift-UITests/LaunchUITest.swift similarity index 100% rename from Samples/iOS13-Swift-UITests/LaunchUITest.swift rename to Samples/iOS13-Swift/iOS13-Swift-UITests/LaunchUITest.swift diff --git a/Samples/iOS13-Swift/iOS13-Swift.xcconfig b/Samples/iOS13-Swift/iOS13-Swift.xcconfig new file mode 100644 index 00000000000..10c84098ec9 --- /dev/null +++ b/Samples/iOS13-Swift/iOS13-Swift.xcconfig @@ -0,0 +1,26 @@ +#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.iOS13-Swift +INFOPLIST_FILE = iOS-Swift/iOS13-Swift/Info.plist +SUPPORTED_PLATFORMS = iphoneos iphonesimulator diff --git a/Samples/iOS13-Swift.yml b/Samples/iOS13-Swift/iOS13-Swift.yml similarity index 64% rename from Samples/iOS13-Swift.yml rename to Samples/iOS13-Swift/iOS13-Swift.yml index b75838b12c7..737b5b7bba2 100644 --- a/Samples/iOS13-Swift.yml +++ b/Samples/iOS13-Swift/iOS13-Swift.yml @@ -1,4 +1,4 @@ -name: iOS13-Swift_xcodegen +name: iOS13-Swift createIntermediateGroups: true generateEmptyDirectories: true configs: @@ -8,11 +8,11 @@ configs: Release: release projectReferences: Sentry: - path: ../Sentry.xcodeproj + path: ../../Sentry.xcodeproj fileGroups: - - Shared/Config + - ../Shared/Config - iOS13-Swift.yml - - ../Plans/iOS13-Swift_Base.xctestplan + - ../../Plans/iOS13-Swift_Base.xctestplan options: bundleIdPrefix: io.sentry targets: @@ -21,17 +21,17 @@ targets: platform: auto sources: - iOS13-Swift - - Shared/GitInjections.swift - - Shared/DSNStorage.swift - - Shared/SpanExtension.swift - - Shared/UIViewControllerExtension.swift - - Shared/UIViewExtension.swift - - Shared/RandomErrors.swift - - Shared/SpanObserver.swift - - Shared/UIAssert.swift - - Shared/AssertView.swift - - Shared/screenshot.png - - Shared/SampleAssets.xcassets + - ../Shared/GitInjections.swift + - ../Shared/DSNStorage.swift + - ../Shared/SpanExtension.swift + - ../Shared/UIViewControllerExtension.swift + - ../Shared/UIViewExtension.swift + - ../Shared/RandomErrors.swift + - ../Shared/SpanObserver.swift + - ../Shared/UIAssert.swift + - ../Shared/AssertView.swift + - ../Shared/screenshot.png + - ../Shared/SampleAssets.xcassets dependencies: - target: Sentry/Sentry - target: Sentry/SentrySwiftUI @@ -41,11 +41,11 @@ targets: Test: iOS13-Swift.xcconfig TestCI: iOS13-Swift.xcconfig postCompileScripts: - - script: Shared/inject-git-info.sh + - script: ../Shared/inject-git-info.sh name: Inject Git Information into Info.plist basedOnDependencyAnalysis: false postBuildScripts: - - script: Shared/reset-git-info.sh + - script: ../Shared/reset-git-info.sh name: Reset Git Fields in Info.plist basedOnDependencyAnalysis: false iOS13-Swift-UITests: @@ -67,4 +67,4 @@ schemes: test: config: Test testPlans: - - path: ../Plans/iOS13-Swift_Base.xctestplan + - path: ../../Plans/iOS13-Swift_Base.xctestplan diff --git a/Samples/iOS13-Swift/iOS13-Swift/AppDelegate.swift b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/AppDelegate.swift similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/AppDelegate.swift rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/AppDelegate.swift diff --git a/Samples/iOS13-Swift/iOS13-Swift/Base.lproj/Main.storyboard b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/Base.lproj/Main.storyboard similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/Base.lproj/Main.storyboard rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/Base.lproj/Main.storyboard diff --git a/Samples/iOS13-Swift/iOS13-Swift/Info.plist b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/Info.plist similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/Info.plist rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/Info.plist diff --git a/Samples/iOS13-Swift/iOS13-Swift/MainViewController.swift b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/MainViewController.swift similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/MainViewController.swift rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/MainViewController.swift diff --git a/Samples/iOS13-Swift/iOS13-Swift/SceneDelegate.swift b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/SceneDelegate.swift similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/SceneDelegate.swift rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/SceneDelegate.swift diff --git a/Samples/iOS13-Swift/iOS13-Swift/SwiftUIView.swift b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/SwiftUIView.swift similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/SwiftUIView.swift rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/SwiftUIView.swift diff --git a/Samples/iOS13-Swift/iOS13-Swift/SwiftUIViewController.swift b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/SwiftUIViewController.swift similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/SwiftUIViewController.swift rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/SwiftUIViewController.swift diff --git a/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift-Bridging-Header.h b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/iOS13-Swift-Bridging-Header.h similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift-Bridging-Header.h rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/iOS13-Swift-Bridging-Header.h diff --git a/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift.entitlements b/Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/iOS13-Swift.entitlements similarity index 100% rename from Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift.entitlements rename to Samples/iOS13-Swift/iOS13-Swift/iOS13-Swift/iOS13-Swift.entitlements diff --git a/Sentry.xcworkspace/contents.xcworkspacedata b/Sentry.xcworkspace/contents.xcworkspacedata index a35e9535248..3400599ad01 100644 --- a/Sentry.xcworkspace/contents.xcworkspacedata +++ b/Sentry.xcworkspace/contents.xcworkspacedata @@ -35,13 +35,10 @@ location = "group:Samples/iOS-Swift/iOS-Swift.xcodeproj"> + location = "group:Samples/iOS-Swift6/iOS-Swift6.xcodeproj"> - - + location = "group:Samples/iOS13-Swift/iOS13-Swift.xcodeproj"> diff --git a/Utils/VersionBump/main.swift b/Utils/VersionBump/main.swift index 04683d2156a..9c4d10576d7 100644 --- a/Utils/VersionBump/main.swift +++ b/Utils/VersionBump/main.swift @@ -16,7 +16,7 @@ let files = [ // Files that only accept the format x.x.x in order to release an app using the framework. // This will enable publishing apps with SDK beta version. let restrictFiles = [ - "./Samples/iOS-Swift/iOS-Swift/Sample.xcconfig", + "./Samples/iOS-Swift/Sample.xcconfig", "./Sources/Configuration/SDK.xcconfig", "./Sources/Configuration/SentrySwiftUI.xcconfig" ] diff --git a/develop-docs/README.md b/develop-docs/README.md index 236bda3df0a..61da01c908a 100644 --- a/develop-docs/README.md +++ b/develop-docs/README.md @@ -122,7 +122,7 @@ We recommend using `XCTAssertEqual(, )` over `XCTAssertEq ## Performance benchmarking -Once daily and for every PR via [Github action](../.github/workflows/benchmarking.yml), the benchmark runs in Sauce Labs, on a [high-end device](https://github.com/getsentry/sentry/blob/8986f81e19f63ee370b1649e08630c9b946c87ed/src/sentry/profiles/device.py#L43-L49) we categorize. Benchmarks run from an XCUITest (`iOS-Benchmarking` target) using the iOS-Swift sample app, under the `iOS-Benchmarking` scheme. [`PerformanceViewController`](../Samples/iOS-Swift/iOS-Swift/ViewControllers/PerformanceViewController.swift) provides a start and stop button for controlling when the benchmarking runs, and a text field to marshal observations from within the test harness app into the test runner app. There, we assert that the P90 of all trials remains under 5%. We also print the raw results to the test runner's console logs for postprocessing into reports with `//scripts/process-benchmark-raw-results.py`. +Once daily and for every PR via [Github action](../.github/workflows/benchmarking.yml), the benchmark runs in Sauce Labs, on a [high-end device](https://github.com/getsentry/sentry/blob/8986f81e19f63ee370b1649e08630c9b946c87ed/src/sentry/profiles/device.py#L43-L49) we categorize. Benchmarks run from an XCUITest (`iOS-Benchmarking` target) using the iOS-Swift sample app, under the `iOS-Benchmarking` scheme. [`PerformanceViewController`](../Samples/iOS-Swift/ViewControllers/PerformanceViewController.swift) provides a start and stop button for controlling when the benchmarking runs, and a text field to marshal observations from within the test harness app into the test runner app. There, we assert that the P90 of all trials remains under 5%. We also print the raw results to the test runner's console logs for postprocessing into reports with `//scripts/process-benchmark-raw-results.py`. ### Test procedure diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 8403930af9e..b78755bd5cd 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,18 +1,14 @@ default_platform(:ios) platform :ios do - ios_swift_infoplist_path = "./Samples/iOS-Swift/iOS-Swift/Info.plist" - ios_swift_clip_infoplist_path = "./Samples/iOS-Swift/iOS-SwiftClip/Info.plist" + ios_swift_infoplist_path = "./Samples/iOS-Swift/Info.plist" + ios_swift_clip_infoplist_path = "./Samples/iOS-SwiftClip/Info.plist" configuration = if is_ci then 'TestCI' else 'Test' end lane :bump_build_number do increment_build_number( build_number: ENV["FASTLANE_BUILD_NUMBER"], - xcodeproj: "./Samples/iOS-Swift/iOS-Swift.xcodeproj" - ) - increment_build_number( - build_number: ENV["FASTLANE_BUILD_NUMBER"], - xcodeproj: "./Samples/iOS-Swift_xcodegen.xcodeproj" + xcodeproj: "./Samples/iOS-Swift.xcodeproj" ) end @@ -20,14 +16,14 @@ platform :ios do # for App Store Connect. If we are on a preview we to remove these suffixes. lane :remove_preview_version_suffixes do version = get_version_number( - xcodeproj: "Samples/iOS-Swift_xcodegen.xcodeproj", + xcodeproj: "Samples/iOS-Swift.xcodeproj", target: "iOS-Swift" ) new_version = version.split("-", -1)[0] # We also need to replace the MARKETING_VERSION otherwise the build will fail with # error: The CFBundleShortVersionString of an App Clip ('8.9.0-beta.1') must match that of its containing parent app ('8.9.0'). - sh "sed -i '' 's/MARKETING_VERSION = #{version}/MARKETING_VERSION = #{new_version}/g' ../Samples/iOS-Swift/iOS-Swift.xcodeproj/project.pbxproj" + sh "sed -i '' 's/MARKETING_VERSION = #{version}/MARKETING_VERSION = #{new_version}/g' ../Samples/iOS-Swift.xcodeproj/project.pbxproj" set_info_plist_value( path: ios_swift_infoplist_path,