-
Notifications
You must be signed in to change notification settings - Fork 3
XCframework fixes [Closes #18] #19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jcmosc
wants to merge
5
commits into
main
Choose a base branch
from
issue-18-xcframework-fixes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
238666d
Manually zip the xcframework bundle before uploading as a Github Acti…
jcmosc 874149d
Support iOS and iOS Simulator when creating XCFramework bundle
jcmosc 65bfea2
Move Swift checkout to .build/checkouts/swift and add clone-swift.sh …
jcmosc 42c7d40
Lower deployment target to 26.0 from 26.2 in Xcode project file
jcmosc 1f7187d
Update Swift compiler directives for iOS
jcmosc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,3 @@ | |
|
|
||
| # Xcode | ||
| xcuserdata | ||
|
|
||
| # Dependencies | ||
| Checkouts | ||
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 |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| #!/bin/zsh | ||
|
|
||
| set -e | ||
|
|
||
| # Default values | ||
| CHECKOUT_PATH=".build/checkouts/swift" | ||
| SWIFT_VERSION="" | ||
|
|
||
| # Parse arguments | ||
| while [[ $# -gt 0 ]]; do | ||
| case $1 in | ||
| --path) | ||
| CHECKOUT_PATH="$2" | ||
| shift 2 | ||
| ;; | ||
| --swift-version) | ||
| SWIFT_VERSION="$2" | ||
| shift 2 | ||
| ;; | ||
| *) | ||
| echo "Unknown option: $1" | ||
| echo "Usage: $0 [--path <path>] [--swift-version <major.minor>]" | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| # Detect Swift version if not provided | ||
| if [ -z "$SWIFT_VERSION" ]; then | ||
| SWIFT_VERSION=$(swift --version 2>/dev/null | grep -oE 'Swift version [0-9]+\.[0-9]+' | grep -oE '[0-9]+\.[0-9]+') | ||
| echo "Detected Swift version: $SWIFT_VERSION" | ||
| fi | ||
|
|
||
| SWIFT_VERSION_MAJOR=$(echo "$SWIFT_VERSION" | cut -d. -f1) | ||
| SWIFT_VERSION_MINOR=$(echo "$SWIFT_VERSION" | cut -d. -f2) | ||
|
|
||
| # Remove existing checkout if present | ||
| rm -rf "$CHECKOUT_PATH" | ||
| mkdir -p "$CHECKOUT_PATH" | ||
|
|
||
| # Clone with sparse checkout | ||
| git clone --filter=blob:none --no-checkout --depth 1 \ | ||
| --branch "release/$SWIFT_VERSION_MAJOR.$SWIFT_VERSION_MINOR" \ | ||
| git@github.com:swiftlang/swift.git "$CHECKOUT_PATH" | ||
|
|
||
| cd "$CHECKOUT_PATH" | ||
|
|
||
| git sparse-checkout set --no-cone \ | ||
| include/swift \ | ||
| stdlib/include \ | ||
| stdlib/public/SwiftShims \ | ||
| stdlib/public/runtime/MetadataAllocatorTags.def | ||
|
|
||
| git checkout | ||
|
|
||
| # Write CMakeConfig.h file | ||
| cat > include/swift/Runtime/CMakeConfig.h << EOF | ||
| #ifndef SWIFT_RUNTIME_CMAKECONFIG_H | ||
| #define SWIFT_RUNTIME_CMAKECONFIG_H | ||
| #define SWIFT_VERSION_MAJOR "$SWIFT_VERSION_MAJOR" | ||
| #define SWIFT_VERSION_MINOR "$SWIFT_VERSION_MINOR" | ||
| #endif | ||
| EOF | ||
|
|
||
| echo "The Swift repository has been cloned to $CHECKOUT_PATH" |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit:
Maybe use #if canImport(Darwin) or #if canImport(ObjectiveC) since the upstream may add other Darwin platform support like watchOS and visionOS?