Add support for watchOS 6.0.0+ #227
Merged
Conversation
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
|
|
scottybobandy
commented
Dec 7, 2023
Comment on lines
+183
to
+186
| @available(iOS 16, *) | ||
| @available(macOS 13, *) | ||
| @available(tvOS 16, *) | ||
| @available(watchOS 9, *) |
There was a problem hiding this comment.
Additional attributes added for minimum requirements to run the test suite on targets other than macOS.
|
Thank you for submitting this! I'll review on Monday when I'm back. |
nicksnyder
reviewed
Dec 7, 2023
Libraries/Connect/Public/Implementation/Clients/URLSessionHTTPClient.swift
Show resolved
Hide resolved
scottybobandy
force-pushed
the
add_watchOS_support
branch
from
8a5c372 to
4c68923
Compare
rebello95
approved these changes
Dec 9, 2023
|
Pushed fixes to the PR to resolve CI issues (also started a Slack discussion to figure out what happened to the pinned conformance test version) |
|
Fixing CI here, changes ended up being a bit more involved: #228 |
|
Pulled in CI fixes from |
eseay
approved these changes
Dec 11, 2023
rebello95
added a commit
that referenced
this pull request
Dec 11, 2023
- Updates CI to run tests against macOS, iOS, tvOS, and watchOS rather than only the default environment (macOS) - Switches from using `swift test` to `xcodebuild test` since the former does not allow for specifying a target SDK/environment (see [this question](https://stackoverflow.com/questions/60245159/how-can-i-build-a-swift-package-for-ios-over-command-line) and [these notes](https://www.jessesquires.com/blog/2021/11/03/swift-package-ios-tests/)) - Updates `@available` annotations to properly accomodate these additional platforms Follow-up to #227 and related to #226.
This was referenced Dec 11, 2023
rebello95
added a commit
that referenced
this pull request
Jan 9, 2024
- Adds new CI jobs to build the library against macOS, iOS, tvOS, and watchOS rather than only the default environment (macOS) - Updates `@available` annotations to properly accommodate these additional platforms - Updates CI to use Xcode 15.1 Originally the intent was to run tests on each platform, but for some reason GitHub runners are refusing to cooperate and jobs are stalling. Instead, we'll continue running `swift test` which runs tests on the host environment (macOS) and will use `xcodebuild` to build for each platform since it allows for specifying a target SDK/environment (see [this question](https://stackoverflow.com/questions/60245159/how-can-i-build-a-swift-package-for-ios-over-command-line) and [these notes](https://www.jessesquires.com/blog/2021/11/03/swift-package-ios-tests/)). Follow-up to #227 and related to #226.
rebello95
added a commit
that referenced
this pull request
Jan 20, 2024
These were changed from `CFNetworkErrors` to hardcoded values in #227 to remove the `CFNetwork` import in order to support watchOS. As an alternative, we can use `URLError` values.
rebello95
added a commit
that referenced
this pull request
Jan 31, 2024
These were changed from `CFNetworkErrors` to hardcoded values in #227 to remove the `CFNetwork` import in order to support watchOS. As an alternative, we can use `URLError` values and keep them strongly typed. The replacements are the same except for `CFNetworkErrors.cfurlErrorUnknown.rawValue` which will still be correctly mapped to `.unknown` via the `...100` case. <img width="629" alt="Screenshot 2024-01-20 at 10 07 47 AM" src="https://github.com/connectrpc/connect-swift/assets/2643476/0d77a632-ccae-4b6a-811f-86481fddc4b7">
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #226
This PR allows connect-swift to be compiled for
watchOS.Minimum deployment target of
watchOS 6.0.0:AsyncStream, which requireswatchOS 6.0.0.AsyncStream.As outlined in the linked issue, we cannot import
CFNetworkonwatchOS:CFNetworkimport removed fromURLSessionHTTPClient.fromURLSessionCode(:)was updated to pattern match on error codes explicitly, taking precedent fromfromHTTPStatus(:).Contributing checklist: