Swift 6-ify the package manifest #1955
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
Motivation: v2 will require the Swift 6 language mode. In order to continue developing v1 and v2 on main we'll need a Swift 6 specific manifest version in addition to the 5.x version. Moving forward we'll have two package manifests, `Package.swift` for 5.x containing only v1, and `[email protected]` using tools version 6.0 targetting v1 and v2. Modifications: - Remove v2 targets from Package.swift - Add a second manifest and make it warning free with Swift 6, this requires turning `static let`s to `static var`s. - Conditionalise some imports in `protoc-gen-grpc-swift` (as it is shared by v1 and v2) - Fix an error in the plugin for Swift 6 Result: v2 now only compiles with a Swift 6 compiler
glbrntt
added
semver/none
gjcairo
reviewed
Jul 2, 2024
| .atomics | ||
| ], | ||
| path: "Sources/GRPCCore", | ||
| swiftSettings: [.swiftLanguageVersion(.v5)] |
There was a problem hiding this comment.
Do we want to adopt Swift 6 language version for the v2 packages? Or not yet?
There was a problem hiding this comment.
I'm going to make the changes in a separate PR to keep the diff small(er). This way we can do it module by module (or at least do the larger ones separately)
Comment on lines
174
to
175
| if options.v2 { | ||
| #if compiler(>=6.0) |
There was a problem hiding this comment.
Should we fatalError (or error in some other way) if the compiler is not Swift 6+ but the v2 option is set?
There was a problem hiding this comment.
Hmm, good question. I think we should actually put the v2 option behind the compiler guard too tbh.
gjcairo
approved these changes
Jul 2, 2024
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.
Motivation:
v2 will require the Swift 6 language mode. In order to continue developing v1 and v2 on main we'll need a Swift 6 specific manifest version in addition to the 5.x version.
Moving forward we'll have two package manifests,
Package.swiftfor 5.x containing only v1, and[email protected]using tools version 6.0 targetting v1 and v2.Modifications:
static lets tostatic vars.protoc-gen-grpc-swift(as it is shared by v1 and v2)Result:
v2 now only compiles with a Swift 6 compiler