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
40 changes: 16 additions & 24 deletions .github/workflows/SundialKit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
swift:
- version: "6.1"
- version: "6.2"
- version: "6.1"
nightly: true
- version: "6.2"
nightly: true
steps:
Expand Down Expand Up @@ -49,27 +47,25 @@ jobs:
include:
# SPM Build Matrix - Xcode 16.x+ (Swift 6.x)
- runs-on: macos-26
xcode: "/Applications/Xcode_26.1.app"
xcode: "/Applications/Xcode_26.2.app"
- runs-on: macos-26
xcode: "/Applications/Xcode_26.0.app"
xcode: "/Applications/Xcode_26.1.app"
- runs-on: macos-15
xcode: "/Applications/Xcode_16.4.app"
- runs-on: macos-15
xcode: "/Applications/Xcode_16.3.app"

# iOS Build Matrix - Xcode 16.x+ (Swift 6.x)
- type: ios
runs-on: macos-26
xcode: "/Applications/Xcode_26.1.app"
xcode: "/Applications/Xcode_26.2.app"
deviceName: "iPhone 17 Pro"
osVersion: "26.1"
osVersion: "26.2"
download-platform: true

- type: ios
runs-on: macos-26
xcode: "/Applications/Xcode_26.0.app"
xcode: "/Applications/Xcode_26.1.app"
deviceName: "iPhone 17 Pro"
osVersion: "26.0.1"
osVersion: "26.1"
download-platform: true

- type: ios
Expand All @@ -78,23 +74,17 @@ jobs:
deviceName: "iPhone 16e"
osVersion: "18.5"

- type: ios
runs-on: macos-15
xcode: "/Applications/Xcode_16.3.app"
deviceName: "iPhone 16"
osVersion: "18.4"

# watchOS Build Matrix - Xcode 16.x+ (Swift 6.x)
- type: watchos
runs-on: macos-26
xcode: "/Applications/Xcode_26.1.app"
xcode: "/Applications/Xcode_26.2.app"
deviceName: "Apple Watch Ultra 3 (49mm)"
osVersion: "26.0"
osVersion: "26.2"
download-platform: true

- type: watchos
runs-on: macos-26
xcode: "/Applications/Xcode_26.0.app"
xcode: "/Applications/Xcode_26.1.app"
deviceName: "Apple Watch Ultra 3 (49mm)"
osVersion: "26.0"
download-platform: true
Expand All @@ -105,11 +95,13 @@ jobs:
deviceName: "Apple Watch Series 10 (46mm)"
osVersion: "11.5"

- type: watchos
runs-on: macos-15
xcode: "/Applications/Xcode_16.3.app"
deviceName: "Apple Watch Series 10 (42mm)"
osVersion: "11.4"
# visionOS Build Matrix - Xcode 16.x+ (Swift 6.x)
- type: visionos
runs-on: macos-26
xcode: "/Applications/Xcode_26.2.app"
deviceName: "Apple Vision Pro"
osVersion: "26.2"
download-platform: true

steps:
- uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sundial-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ jobs:
# iOS Builds - Xcode 26.x on macOS-26
- type: ios
runs-on: macos-26
xcode: "/Applications/Xcode_26.0.app"
xcode: "/Applications/Xcode_26.2.app"
deviceName: "iPhone 17 Pro"
osVersion: "26.0.1"
osVersion: "26.2"
download-platform: true

- type: ios
Expand All @@ -49,9 +49,9 @@ jobs:
# watchOS Builds - Xcode 26.x on macOS-26
- type: watchos
runs-on: macos-26
xcode: "/Applications/Xcode_26.0.app"
xcode: "/Applications/Xcode_26.2.app"
deviceName: "Apple Watch Ultra 3 (49mm)"
osVersion: "26.0"
osVersion: "26.2"
download-platform: true

- type: watchos
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
working-directory: ${{ env.DEMO_PATH }}

- name: Select Xcode
run: sudo xcode-select -s "/Applications/Xcode_26.0.app"
run: sudo xcode-select -s "/Applications/Xcode_26.1.app"

- name: Setup SSH for AppCerts repository
uses: webfactory/ssh-agent@v0.9.0
Expand Down
4 changes: 3 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ let package = Package(
.iOS(.v16),
.watchOS(.v9),
.tvOS(.v16),
.macOS(.v11)
.macOS(.v11),
.visionOS(.v1),
.macCatalyst(.v13)
],
products: [
// Core protocols and types
Expand Down
2 changes: 1 addition & 1 deletion Sources/SundialKitConnectivity/Extensions/WCSession.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
extension WCSession {
/// polyfill for whether the app is installed on the other device
public var isPairedAppInstalled: Bool {
#if os(iOS)
#if os(iOS) || os(visionOS)
return isWatchAppInstalled
#else
return isCompanionAppInstalled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
)
}

#if os(iOS)
#if os(iOS) || os(visionOS)

internal func sessionDidBecomeInactive(_: WCSession) {
delegate?.sessionDidBecomeInactive(self)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public import SundialKitCore
]

// Add vpnInactive mapping on newer platforms where it's available
if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, *) {
if #available(macOS 15.0, iOS 18.0, watchOS 11.0, tvOS 18.0, visionOS 2.0, *) {
mappings[.vpnInactive] = .vpnInactive
}

Expand Down
Loading