Add visionOS support #1098
+151
−36
There are no files selected for viewing
This file contains 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 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 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
|
There was a problem hiding this comment. This change to SPM version 2 should be fine, but up for discussion if we want to have it. Version 2 is available since Swift 5.6 with Xcode 13. I did a test opening the project with Xcode 14, and it worked without problems. |
This file contains 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 |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| { | ||
| "pins" : [ | ||
| { | ||
| "identity" : "cwlcatchexception", | ||
| "kind" : "remoteSourceControl", | ||
| "location" : "https://github.com/mattgallagher/CwlCatchException.git", | ||
| "state" : { | ||
| "revision" : "3b123999de19bf04905bc1dfdb76f817b0f2cc00", | ||
| "version" : "2.1.2" | ||
| } | ||
| }, | ||
| { | ||
| "identity" : "cwlpreconditiontesting", | ||
| "kind" : "remoteSourceControl", | ||
| "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git", | ||
| "state" : { | ||
| "revision" : "dc9af4781f2afdd1e68e90f80b8603be73ea7abc", | ||
| "version" : "2.2.0" | ||
| } | ||
| } | ||
| ], | ||
| "version" : 2 | ||
| } |
This file contains 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 @@ | ||
| // swift-tools-version:5.9 | ||
|
There was a problem hiding this comment. This file was added to not break support for older Swift versions. See details about this here: https://www.polpiella.dev/version-specific-package-manifests |
||
| import PackageDescription | ||
|
|
||
| let package = Package( | ||
| name: "Nimble", | ||
| platforms: [ | ||
| .macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6), .visionOS(.v1) | ||
| ], | ||
| products: [ | ||
| .library( | ||
| name: "Nimble", | ||
| targets: { | ||
| var targets: [String] = ["Nimble"] | ||
| #if os(macOS) | ||
| targets.append("NimbleObjectiveC") | ||
| #endif | ||
| return targets | ||
| }() | ||
| ), | ||
| ], | ||
| dependencies: [ | ||
| .package(url: "https://github.com/mattgallagher/CwlPreconditionTesting.git", .upToNextMajor(from: "2.2.0")), | ||
| ], | ||
| targets: { | ||
| var testHelperDependencies: [PackageDescription.Target.Dependency] = ["Nimble"] | ||
| #if os(macOS) | ||
| testHelperDependencies.append("NimbleObjectiveC") | ||
| #endif | ||
| var targets: [Target] = [ | ||
| .target( | ||
| name: "Nimble", | ||
| dependencies: [ | ||
| .product(name: "CwlPreconditionTesting", package: "CwlPreconditionTesting", | ||
| condition: .when(platforms: [.macOS, .iOS, .macCatalyst, .visionOS])), | ||
| .product(name: "CwlPosixPreconditionTesting", package: "CwlPreconditionTesting", | ||
| condition: .when(platforms: [.tvOS, .watchOS])) | ||
| ], | ||
| exclude: ["Info.plist"] | ||
| ), | ||
| .target( | ||
| name: "NimbleSharedTestHelpers", | ||
| dependencies: testHelperDependencies | ||
| ), | ||
| .testTarget( | ||
| name: "NimbleTests", | ||
| dependencies: ["Nimble", "NimbleSharedTestHelpers"], | ||
| exclude: ["Info.plist"] | ||
| ), | ||
| ] | ||
| #if os(macOS) | ||
| targets.append(contentsOf: [ | ||
| .target( | ||
| name: "NimbleObjectiveC", | ||
| dependencies: ["Nimble"] | ||
| ), | ||
| .testTarget( | ||
| name: "NimbleObjectiveCTests", | ||
| dependencies: ["NimbleObjectiveC", "Nimble", "NimbleSharedTestHelpers"] | ||
| ) | ||
| ]) | ||
| #endif | ||
| return targets | ||
| }(), | ||
| swiftLanguageVersions: [.v5] | ||
| ) | ||
This file contains 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 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 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 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 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 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
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.
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.
Github actions doesn't yet support 15.2 - actions/runner-images#9169
We'll see this test failing until that's merged.
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.
But it is mentioned here 🤔
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.
Oh. Well, excellent. Guess the thread I found was already out of date.
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.
Well, this is annoying. Is the Vision Pro simulator not created by default? https://github.com/Quick/Nimble/actions/runs/7554289300/job/20585517470?pr=1098
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.
It looks like it 😞
6eb5881 I reverted it to unblock this PR. Will keep an eye on the GH runner images and add it once it changes.
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.
Just found this issue (which is basically what you linked) where they point out that the version of Xcode 15.2 is the beta 2 and not the final version. I guess it should be fine once they use the stable version of 15.2.
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.
I'll watch that thread and update our CI once a new build is out.