Add visionOS support #1098

stonko1994 · 2023-11-02T14:18:33Z

This PR builds upon #1083 but includes CocoaPods and testing support.

Before this PR can be merged, two counterparts PRs in CwlPreconditionTesting need to be merged first:

Based on this PR, I opened a discussion to outline a problematic usage of Carthage.

Checklist - While not every PR needs it, new features should consider this list:

Does this have tests?
Does this have documentation?
Does this break the public API (Requires major version bump)?
Is this a new feature (Requires minor version bump)?

…icit Package.swift file

stonko1994 · 2023-11-03T09:31:47Z

[email protected]

@@ -0,0 +1,66 @@
+// swift-tools-version:5.9


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

stonko1994 · 2023-11-03T09:38:54Z

@younata I have some questions how to handle certain things in this PR:

How to handle the dependency PRs of CwlPreconditionTesting if they are not getting picked up in a timely manner?
What is the strategy for the CI and the tests? Currently, it would fail since there is no Xcode 15.1 installed, and therefore, visionOS is unknown. Should we skip the visionOS tests for now and update to the according macOS images once it is included in a stable Xcode version?

younata · 2023-11-03T17:16:17Z

This is good work! Thank you so much for pushing for this.

How to handle the dependency PRs of CwlPreconditionTesting if they are not getting picked up in a timely manner?

I think what we have here, pointing to a fork, is good for now. I'm hesitant to release a version pointing to the forks, but we'll cross that bridge when we get there. Presumably CwlPreconditionTesting is also hesitant to officially support for an unreleased platform.

What is the strategy for the CI and the tests? Currently, it would fail since there is no Xcode 15.1 installed, and therefore, visionOS is unknown. Should we skip the visionOS tests for now and update to the according macOS images once it is included in a stable Xcode version?

I think that's the best we can do for now. We'll probably have to wait even longer for GitHub to add images that include visionOS.

stonko1994 · 2023-11-04T10:48:41Z

Thanks 🙇‍♂️ I modified the test script to skip visionOS tests if no SDK is present: b86604f

stonko1994 · 2023-11-10T08:07:08Z

@younata, I tried to fix the failing CI steps. Should be working now.

stonko1994 · 2023-11-14T08:20:09Z

The PRs in CwlPreconditionTesting were merged and I reverted back to the official repo 💪

# Conflicts: # Carthage/Checkouts/CwlCatchException/Package.swift # Carthage/Checkouts/CwlCatchException/README.md # Carthage/Checkouts/CwlCatchException/Sources/CwlCatchException/CwlCatchException.swift # Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/CwlCatchException.m # Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h # Carthage/Checkouts/CwlPreconditionTesting/Package.swift # Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m # Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h # Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.c # Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlMachBadInstructionHandler/mach_excServer.h # Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlBadInstructionException.swift # Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlCatchBadInstruction.swift # Carthage/Checkouts/CwlPreconditionTesting/Sources/CwlPreconditionTesting/CwlDarwinDefinitions.swift # Nimble.podspec # Nimble.xcodeproj/project.pbxproj # Sources/Nimble/Nimble.h # test

stonko1994 · 2023-12-21T14:35:25Z

@younata I merged main into this branch to also use the transitive dependency changes 🙌

I would still wait for #1107 to be finished before I update the build on this PR.

younata · 2024-01-10T07:57:01Z

@stonko1994 I (finally...) got around to getting #1107 working and merged. Looking forward to THAT being taken care of from now on. Please pull in current main, and I'll be happy to merge this as soon as I can.

# Conflicts: # Cartfile.private # Cartfile.resolved # Nimble.xcodeproj/project.pbxproj

stonko1994 · 2024-01-17T10:33:15Z

Package.resolved

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.

stonko1994 · 2024-01-17T10:34:19Z

@younata I merged main into this branch 💪 Please execute the CI checks to see if everything works as expected now. Other than that it's ready to be merged from my side.

younata

We'll wait a bit until Github Actions supports Xcode 15.2 before I merge, but this looks pretty good!

younata · 2024-01-17T17:47:31Z

.github/workflows/ci-xcode.yml

@@ -32,7 +32,7 @@ jobs:
    runs-on: macos-13
    strategy:
      matrix:
-        xcode: ["14.3.1"]
+        xcode: ["14.3.1", "15.2"]


Github actions doesn't yet support 15.2 - actions/runner-images#9169

We'll see this test failing until that's merged.

But it is mentioned here 🤔

Oh. Well, excellent. Guess the thread I found was already out of date.

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

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.

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.

I'll watch that thread and update our CI once a new build is out.

* it looks like the visionOS simulator is not created by default on the used macOS image

This PR contains the following updates: | Package | Update | Change | |---|---|---| | [Quick/Nimble](https://togithub.com/Quick/Nimble) | minor | `from: "13.1.2"` -> `from: "13.2.0"` | --- ### Release Notes <details> <summary>Quick/Nimble (Quick/Nimble)</summary> ### [`v13.2.0`](https://togithub.com/Quick/Nimble/releases/tag/v13.2.0): - visionOS, map matcher. [Compare Source](https://togithub.com/Quick/Nimble/compare/v13.1.2...v13.2.0) ### Highlights - Nimble now supports visionOS! Thanks [@stonko1994](https://togithub.com/stonko1994)! - Adds a new `map` matcher. `map` allows you to transform the expression to another value, and pass that value to another matcher. - For example, if you wanted to match the first element in a tuple easily, you could write: `expect(myTuple).to(map(\.0, equal(expectedValue)))`. - See [the docs for more suggestions](https://togithub.com/Quick/Nimble/tree/v13.2.0#mapping-a-value-to-another-value)! ### Autogenerated Release Notes #### What's Changed - Add a `map` matcher. by [@younata](https://togithub.com/younata) in [https://github.com/Quick/Nimble/pull/1112](https://togithub.com/Quick/Nimble/pull/1112) - Build the carthage frameworks in a github action by [@younata](https://togithub.com/younata) in [https://github.com/Quick/Nimble/pull/1107](https://togithub.com/Quick/Nimble/pull/1107) - Bump cocoapods from 1.14.2 to 1.14.3 by [@dependabot](https://togithub.com/dependabot) in [https://github.com/Quick/Nimble/pull/1100](https://togithub.com/Quick/Nimble/pull/1100) - Add a privacy manifest by [@younata](https://togithub.com/younata) in [https://github.com/Quick/Nimble/pull/1113](https://togithub.com/Quick/Nimble/pull/1113) - Add visionOS support by [@stonko1994](https://togithub.com/stonko1994) in [https://github.com/Quick/Nimble/pull/1098](https://togithub.com/Quick/Nimble/pull/1098) #### New Contributors - [@stonko1994](https://togithub.com/stonko1994) made their first contribution in [https://github.com/Quick/Nimble/pull/1098](https://togithub.com/Quick/Nimble/pull/1098) **Full Changelog**: Quick/Nimble@v13.1.2...v13.2.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate).  Co-authored-by: Self-hosted Renovate Bot <361546+cgrindel-self-hosted-renovate[bot]@users.noreply.github.enterprise.com>

stonko1994 added 8 commits November 2, 2023 12:19

add compiler directives for visionOS support

4c69024

add SPM visionOS support

0f901d9

add CocoaPods visionOS support

d3eebfd

update Carthage dependencies

8663e72

add visionOS support when using the Xcode project

a594e61

extend test script to include visionOS

f0fb4c4

fix cocoapods support by modifying dependencies directly

3720617

do not break older Swift version support by creating a swift 5.9 expl…

78b4e76

…icit Package.swift file

stonko1994 commented Nov 3, 2023

View reviewed changes

stonko1994 mentioned this pull request Nov 3, 2023

Add visionOS support Quick/Quick#1249

Merged

4 tasks

skip tests on visionOS if it's not present

b86604f

stonko1994 marked this pull request as ready for review November 4, 2023 10:48

stonko1994 added 2 commits November 10, 2023 08:50

fix build issues below Xcode 15

a8d72dd

skip visionOS cocoapod validation if visionOS is not present

00d6003

move TARGET_OS_VISION definition to umbrella header

5cf19ca

bump CwlPreconditionTesting to 2.2.0

3ff34fc

stonko1994 force-pushed the bitmovin/feature/visionos-support branch from 154c37e to 3ff34fc Compare November 14, 2023 11:53

stonko1994 added 3 commits December 21, 2023 15:16

link CwlPreconditionTesting on visionOS

1972142

add visionOS for to dependencies array

c08b060

Merge branch 'main' into bitmovin/feature/visionos-support

eaac8f4

younata approved these changes Jan 10, 2024

View reviewed changes

Merge branch 'main' into bitmovin/feature/visionos-support

11c9bc7

# Conflicts: # Cartfile.private # Cartfile.resolved # Nimble.xcodeproj/project.pbxproj

add CI execution for visionOS with Xcode 15.2

9eaf3be

stonko1994 commented Jan 17, 2024

View reviewed changes

younata approved these changes Jan 17, 2024

View reviewed changes

remove visionOS testing on Xcode 15.2

6eb5881

* it looks like the visionOS simulator is not created by default on the used macOS image

younata merged commit 52c7526 into Quick:main Jan 17, 2024
14 of 15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add visionOS support #1098

Add visionOS support #1098

stonko1994 commented Nov 2, 2023

stonko1994 Nov 3, 2023

stonko1994 commented Nov 3, 2023

younata commented Nov 3, 2023

stonko1994 commented Nov 4, 2023

stonko1994 commented Nov 10, 2023

stonko1994 commented Nov 14, 2023

stonko1994 commented Dec 21, 2023

younata commented Jan 10, 2024

stonko1994 Jan 17, 2024 •

edited

Loading

stonko1994 commented Jan 17, 2024

younata left a comment

younata Jan 17, 2024

stonko1994 Jan 17, 2024

younata Jan 17, 2024

younata Jan 17, 2024 •

edited

Loading

stonko1994 Jan 17, 2024

stonko1994 Jan 17, 2024 •

edited

Loading

younata Jan 17, 2024

Add visionOS support #1098

Add visionOS support #1098

Conversation

stonko1994 commented Nov 2, 2023

stonko1994 Nov 3, 2023

Choose a reason for hiding this comment

stonko1994 commented Nov 3, 2023

younata commented Nov 3, 2023

stonko1994 commented Nov 4, 2023

stonko1994 commented Nov 10, 2023

stonko1994 commented Nov 14, 2023

stonko1994 commented Dec 21, 2023

younata commented Jan 10, 2024

stonko1994 Jan 17, 2024 • edited Loading

Choose a reason for hiding this comment

stonko1994 commented Jan 17, 2024

younata left a comment

Choose a reason for hiding this comment

younata Jan 17, 2024

Choose a reason for hiding this comment

stonko1994 Jan 17, 2024

Choose a reason for hiding this comment

younata Jan 17, 2024

Choose a reason for hiding this comment

younata Jan 17, 2024 • edited Loading

Choose a reason for hiding this comment

stonko1994 Jan 17, 2024

Choose a reason for hiding this comment

stonko1994 Jan 17, 2024 • edited Loading

Choose a reason for hiding this comment

younata Jan 17, 2024

Choose a reason for hiding this comment

stonko1994 Jan 17, 2024 •

edited

Loading

younata Jan 17, 2024 •

edited

Loading

stonko1994 Jan 17, 2024 •

edited

Loading