Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,20 @@ jobs:
fail-fast: false
matrix:
lib: [SalesforceSDKCommon, SalesforceAnalytics, SalesforceSDKCore, SmartStore, MobileSync]
ios: [^18, ^17]
macos: [macos-15]
include:
- ios: ^18
xcode: ^16
- ios: ^17
xcode: ^15
ios: [^26, ^18, ^17]
xcode: [^26, ^16, ^15]
# Valid combinations that will run:
# - iOS ^26 + Xcode ^26
# - iOS ^18 + Xcode ^26
# - iOS ^18 + Xcode ^16
# - iOS ^17 + Xcode ^15
exclude:
- { ios: ^26, xcode: ^16 }
- { ios: ^26, xcode: ^15 }
- { ios: ^18, xcode: ^15 }
- { ios: ^17, xcode: ^26 }
- { ios: ^17, xcode: ^16 }
uses: ./.github/workflows/reusable-workflow.yaml
with:
lib: ${{ matrix.lib }}
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,20 @@ jobs:
fail-fast: false
matrix:
lib: ${{ fromJson(needs.test-orchestrator.outputs.libs) }}
macos: [macos-15]
ios: [^18, ^26]
xcode: [^16, ^26]
# Valid combinations that will run:
# - iOS ^18 + Xcode ^16
# - iOS ^26 + Xcode ^26
exclude:
- { ios: ^18, xcode: ^26 }
- { ios: ^26, xcode: ^16 }
uses: ./.github/workflows/reusable-workflow.yaml
with:
lib: ${{ matrix.lib }}
ios: ${{ matrix.ios }}
xcode: ${{ matrix.xcode }}
macos: ${{ matrix.macos }}
is_pr: true
secrets: inherit
14 changes: 14 additions & 0 deletions .github/workflows/reusable-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ jobs:
run: |
./install.sh
echo $TEST_CREDENTIALS > ./shared/test/test_credentials.json
- name: Set Xcode Version
run: |
echo "Setting Xcode version to ${{ inputs.xcode }}"
# For specific versions like 16.4, ensure Xcode path exists
if [[ "${{ inputs.xcode }}" =~ ^[0-9]+\.[0-9]+$ ]]; then
XCODE_PATH="/Applications/Xcode_${{ inputs.xcode }}.app"
if [ -d "$XCODE_PATH" ]; then
sudo xcode-select -s "$XCODE_PATH"
echo "Set Xcode to specific version: ${{ inputs.xcode }}"
else
echo "Warning: Xcode ${{ inputs.xcode }} not found at $XCODE_PATH, using mxcl/xcodebuild action to handle version"
fi
fi
xcodebuild -version
- uses: mxcl/xcodebuild@v3
with:
xcode: ${{ inputs.xcode }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import SwiftUI

/// Extension to provide convenience initializers for SwiftUI Colors with light/dark mode support
public extension Color {
init(lightStyle: Color, darkStyle: Color) {
let uiColor = UIColor.sfsdk_color(forLightStyle: UIColor(lightStyle), darkStyle: UIColor(darkStyle))
Expand Down
Loading