feat(objc): Add SentryObjC wrapper SDK #7598
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| name: Assemble SentryObjC XCFramework | ||
|
|
||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| sdks: | ||
| description: |- | ||
| Comma-separated list of SDK slices to assemble. | ||
| required: false | ||
| type: string | ||
| default: "iphoneos,iphonesimulator,macosx,maccatalyst,appletvos,appletvsimulator,watchos,watchsimulator,xros,xrsimulator" | ||
|
|
||
| signed: | ||
| description: |- | ||
| Whether or not the assembled XCFramework should be signed. | ||
| required: false | ||
| type: boolean | ||
| default: false | ||
|
|
||
| release-version: | ||
| description: |- | ||
| For release workflows, the version to inject into the SDK. | ||
| required: false | ||
| type: string | ||
|
cursor[bot] marked this conversation as resolved.
|
||
|
|
||
| jobs: | ||
| assemble-xcframework-sentryobjc: | ||
| name: SentryObjC | ||
| runs-on: macos-15 | ||
| steps: | ||
| - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 | ||
| - uses: ./.github/actions/setup-xcode | ||
| with: | ||
| version: "16.4" | ||
|
|
||
| - name: Setup Ruby | ||
| uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1.292.0 | ||
| if: ${{ inputs.signed }} | ||
| with: | ||
| bundler-cache: true | ||
|
|
||
| - name: "Download Fastlane Certificate" | ||
| if: ${{ inputs.signed }} | ||
| run: bundle exec fastlane prepare_xcframework_signing | ||
| env: | ||
| FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }} | ||
| MATCH_GIT_PRIVATE_KEY: ${{ secrets.MATCH_GIT_PRIVATE_KEY }} | ||
| MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} | ||
| MATCH_USERNAME: ${{ secrets.MATCH_USERNAME }} | ||
|
|
||
| # Download all four sets of static library slices. | ||
| # Each artifact contains a {sdk}.xcarchive.zip for one platform. | ||
| - name: Download Sentry static slices | ||
| uses: actions/download-artifact@v8 | ||
|
cursor[bot] marked this conversation as resolved.
Outdated
|
||
| with: | ||
| pattern: xcframework-sentry-static-slice-* | ||
| path: xcframework-slices/sentry-static | ||
|
|
||
| - name: Download SentryObjCTypes slices | ||
| uses: actions/download-artifact@v8 | ||
| with: | ||
| pattern: xcframework-sentryobjc-types-slice-* | ||
| path: xcframework-slices/sentryobjc-types | ||
|
|
||
| - name: Download SentryObjCBridge slices | ||
| uses: actions/download-artifact@v8 | ||
| with: | ||
| pattern: xcframework-sentryobjc-bridge-slice-* | ||
| path: xcframework-slices/sentryobjc-bridge | ||
|
|
||
| - name: Download SentryObjC slices | ||
| uses: actions/download-artifact@v8 | ||
| with: | ||
| pattern: xcframework-sentryobjc-objc-slice-* | ||
| path: xcframework-slices/sentryobjc-objc | ||
|
|
||
| # Unzip slices into the directory layout expected by | ||
| # build-xcframework-sentryobjc-standalone.sh: | ||
| # XCFrameworkBuildPath/archive/Sentry/{sdk}.xcarchive/... | ||
| # XCFrameworkBuildPath/archive/SentryObjCTypes/{sdk}.xcarchive/... | ||
| # XCFrameworkBuildPath/archive/SentryObjCBridge/{sdk}.xcarchive/... | ||
| # XCFrameworkBuildPath/archive/SentryObjC/{sdk}.xcarchive/... | ||
| - name: Arrange slice archives | ||
| shell: bash | ||
| env: | ||
| SDKS: ${{ inputs.sdks }} | ||
| run: ./scripts/ci-arrange-xcframework-slices.sh --sdks "$SDKS" | ||
|
|
||
| - name: Link and assemble SentryObjC XCFrameworks | ||
| env: | ||
| SDKS: ${{ inputs.sdks }} | ||
| run: ./scripts/build-xcframework-sentryobjc-standalone.sh "$SDKS" | ||
| shell: bash | ||
|
|
||
| - name: Validate XCFramework structure | ||
| run: | | ||
| ./scripts/validate-xcframework-format.sh "SentryObjC-Static.xcframework" | ||
| ./scripts/validate-xcframework-format.sh "SentryObjC-Dynamic.xcframework" | ||
| shell: bash | ||
|
|
||
| - name: Zip XCFrameworks | ||
| env: | ||
| SIGNED: ${{ inputs.signed }} | ||
| run: | | ||
| if [ "$SIGNED" = "true" ]; then | ||
| ./scripts/compress-xcframework.sh --sign SentryObjC-Static | ||
| ./scripts/compress-xcframework.sh --sign SentryObjC-Dynamic | ||
| else | ||
| ./scripts/compress-xcframework.sh --not-signed SentryObjC-Static | ||
| ./scripts/compress-xcframework.sh --not-signed SentryObjC-Dynamic | ||
| fi | ||
| shell: bash | ||
|
|
||
| - name: Upload SentryObjC-Static XCFramework | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| overwrite: true | ||
| name: xcframework-${{github.sha}}-sentryobjc-static | ||
| if-no-files-found: error | ||
| path: SentryObjC-Static.xcframework.zip | ||
|
|
||
| - name: Upload SentryObjC-Dynamic XCFramework | ||
| uses: actions/upload-artifact@v7 | ||
| with: | ||
| overwrite: true | ||
| name: xcframework-${{github.sha}}-sentryobjc-dynamic | ||
| if-no-files-found: error | ||
| path: SentryObjC-Dynamic.xcframework.zip | ||
|
|
||
| - name: Run CI Diagnostics | ||
| if: failure() | ||
| run: ./scripts/ci-diagnostics.sh | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -227,6 +227,45 @@ build-signed-xcframework: | |
| build-xcframework-sample: | ||
| xcodebuild -project "Samples/XCFramework-Validation/XCFramework.xcodeproj" -configuration Release CODE_SIGNING_ALLOWED="NO" build | ||
|
|
||
| ## Build SentryObjC framework for iOS Simulator | ||
| # | ||
| # Builds the SentryObjC framework target for iOS Simulator. | ||
| # This is the Objective-C wrapper framework that provides a stable ABI for ObjC++ consumers. | ||
| # The target must first be added to the Xcode project using: bundle exec ruby scripts/add-sentryobjc-target.rb | ||
| .PHONY: build-sentryobjc | ||
| build-sentryobjc: | ||
| @echo "--> Building SentryObjC for iOS Simulator" | ||
| set -o pipefail && xcodebuild build \ | ||
| -project Sentry.xcodeproj \ | ||
| -scheme SentryObjC \ | ||
| -destination 'platform=iOS Simulator,OS=$(IOS_SIMULATOR_OS),name=$(IOS_DEVICE_NAME)' \ | ||
| -configuration Release \ | ||
| CODE_SIGNING_ALLOWED="NO" 2>&1 | xcbeautify --preserve-unbeautified | ||
|
|
||
| ## Build SentryObjC XCFrameworks locally for one or more SDKs | ||
| # | ||
| # Builds the four staticlib slices (Sentry, SentryObjCTypes, SentryObjCBridge, | ||
| # SentryObjC) and runs the standalone merger to produce SentryObjC-Static and | ||
| # SentryObjC-Dynamic xcframeworks. Output lands in XCFrameworkBuildPath/. | ||
| # | ||
| # SDKS accepts either an SDK preset (iOSOnly, macOSOnly, macCatalystOnly, | ||
| # AllSDKs) or a comma-separated list of SDK names. Required — no default, | ||
| # to keep local iteration fast. | ||
| # | ||
| # Examples: | ||
| # make build-sentryobjc-xcframework-local SDKS=iphonesimulator | ||
| # make build-sentryobjc-xcframework-local SDKS=iphoneos,iphonesimulator | ||
| # make build-sentryobjc-xcframework-local SDKS=iOSOnly | ||
| .PHONY: build-sentryobjc-xcframework-local | ||
| build-sentryobjc-xcframework-local: | ||
| @if [ -z "$(SDKS)" ]; then \ | ||
| echo "error: SDKS is required."; \ | ||
| echo " example: make $@ SDKS=iphonesimulator"; \ | ||
| exit 1; \ | ||
| fi | ||
| @echo "--> Creating SentryObjC xcframeworks (SDKs: $(SDKS))" | ||
| ./scripts/build-xcframework-local.sh "$(SDKS)" SentryObjCOnly | ||
|
|
||
| # ============================================================================ | ||
| # SAMPLE APPS | ||
| # ============================================================================ | ||
|
|
@@ -238,6 +277,7 @@ build-xcframework-sample: | |
| build-samples: \ | ||
| build-sample-DistributionSample \ | ||
| build-sample-iOS-ObjectiveC \ | ||
| build-sample-iOS-ObjectiveCpp-NoModules \ | ||
| build-sample-iOS-Swift \ | ||
| build-sample-iOS-Swift6 \ | ||
| build-sample-iOS-SwiftUI \ | ||
|
|
@@ -332,9 +372,8 @@ build-sample-visionOS-SwiftUI-SPM: | |
|
|
||
| ## Build the iOS-ObjectiveCpp-NoModules sample app | ||
| # | ||
| # Builds the ObjC++ without-modules sample that uses SentryObjC (#6342). | ||
| # Uses #import <SentryObjC/SentryObjC.h> for ObjC++ without -fmodules. | ||
|
Contributor
There was a problem hiding this comment.
Member
Author
There was a problem hiding this comment. Ah an inconsistency. See my other PR feedback comment: Happy to update afterwards |
||
| .PHONY: build-sample-iOS-ObjectiveCpp-NoModules | ||
| build-sample-iOS-ObjectiveCpp-NoModules: | ||
| xcodegen --spec Samples/iOS-ObjectiveCpp-NoModules/iOS-ObjectiveCpp-NoModules.yml | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.