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
5 changes: 5 additions & 0 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@ jobs:
codecov: false
action: test
warnings-as-errors: false
- platform: visionOS
xcode: ^15
codecov: false
action: test
warnings-as-errors: false
steps:
- uses: actions/checkout@v3
- uses: ./
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
- tvOS
- iOS
- mac-catalyst
- visionOS
steps:
- uses: mxcl/xcodebuild@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ inputs:
required: false
platform:
description: |
Either `iOS`, `tvOS`, `macOS`, `watchOS` or (more rarely)
Either `iOS`, `tvOS`, `macOS`, `watchOS`, `visionOS` or (more rarely)
`mac-catalyst`
Leave unset and `xcodebuild` decides itself.
required: false
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions fixtures/visionOS/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.DS_Store
/.build
/Packages
/*.xcodeproj
xcuserdata/
DerivedData/
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
23 changes: 23 additions & 0 deletions fixtures/visionOS/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// swift-tools-version:5.0

import PackageDescription

let name = "my-fixture"

let pkg = Package(
name: name,
products: [
.library(name: name, targets: [name]),
],
targets: [
.target(name: name, path: ".", sources: ["code.swift"]),
.testTarget(name: "\(name)Tests", path: ".", sources: ["test.swift"]),
]
)

pkg.platforms = [
.macOS(.v10_10),
.iOS(.v9),
.tvOS(.v9),
.watchOS(.v3)
]
3 changes: 3 additions & 0 deletions fixtures/visionOS/code.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#if !os(visionOS)
#error("!os(visionOS)")
#endif
20 changes: 20 additions & 0 deletions fixtures/visionOS/test.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#if !os(visionOS)
#error("!os(visionOS)")
#endif

func foo() -> Int {
return 5
}

func bar() {
// deliberate warning
foo()
}

import XCTest

class Test: XCTestCase {
func test() {
XCTAssertEqual(1, 1)
}
}
14 changes: 11 additions & 3 deletions src/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ interface Devices {
}
}

type DeviceType = 'watchOS' | 'tvOS' | 'iOS'
type DeviceType = 'watchOS' | 'tvOS' | 'iOS' | 'xrOS'
type Destination = { [key: string]: string }

interface Schemes {
Expand Down Expand Up @@ -217,6 +217,7 @@ async function destinations(): Promise<Destination> {
tvOS: rv.tvOS?.id,
watchOS: rv.watchOS?.id,
iOS: rv.iOS?.id,
visionOS: rv.xrOS?.id,
}

function parse(key: string): [DeviceType, SemVer?] {
Expand Down Expand Up @@ -290,7 +291,13 @@ export function getConfiguration(): string {
}
}

export type Platform = 'watchOS' | 'iOS' | 'tvOS' | 'macOS' | 'mac-catalyst'
export type Platform =
| 'watchOS'
| 'iOS'
| 'tvOS'
| 'macOS'
| 'mac-catalyst'
| 'visionOS'

export function getAction(
xcodeVersion: SemVer,
Expand Down Expand Up @@ -320,7 +327,8 @@ export async function getDestination(
switch (platform) {
case 'iOS':
case 'tvOS':
case 'watchOS': {
case 'watchOS':
case 'visionOS': {
const id = (await destinations())[platform]
return ['-destination', `id=${id}`]
}
Expand Down