Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Bump minimum Swift version to 5.7 #2524

Merged
merged 4 commits into from
Oct 2, 2023
Merged

Conversation

rnro
Copy link
Contributor

@rnro rnro commented Sep 28, 2023

Motivation:

Now that Swift 5.9 is GM we should update the supported versions and remove 5.6

Modifications:

  • Update Package.swift
  • Remove #if swift(>=5.7) guards
  • Delete the 5.6 docker compose file and make a 5.10 one
  • Update integration test script
  • Update docs

Result:

Remove support for Swift 5.6, add 5.10

[One line description of your change]

Motivation:

[Explain here the context, and why you're making that change. What is the problem you're trying to solve.]

Modifications:

[Describe the modifications you've done.]

Result:

[After your change, what will change.]

Motivation:

Now that Swift 5.9 is GM we should update the supported versions and
remove 5.6

Modifications:

* Update `Package.swift`
* Remove `#if swift(>=5.7)` guards
* Delete the 5.6 docker compose file and make a 5.10 one
* Update integration test script
* Update docs

Result:

Remove support for Swift 5.6, add 5.10
@@ -3,28 +3,27 @@ version: "3"
services:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In addition to this, do you want to update the Swift 5.9 pipeline to use a release rather than nightly image?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please

@yim-lee
Copy link
Member

yim-lee commented Sep 28, 2023

CI changes applied:

  • Remove pipeline for 5.6
  • Add pipeline for 5.10

@swift-server-bot test this please

@yim-lee
Copy link
Member

yim-lee commented Sep 28, 2023

@swift-server-bot test this please

Copy link
Contributor

@Lukasa Lukasa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please clean up the indentation issues, and also update the nightly pipeline per @yim-lee's comment.

@usableFromInline typealias CancelationCallback = () -> Void
#endif
/* private but usableFromInline */ @usableFromInline let _promise: EventLoopPromise<T>
/* private but usableFromInline */ @usableFromInline let _promise: EventLoopPromise<T>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation here got weird.

typealias RepeatedTaskCallback = (RepeatedTask) -> EventLoopFuture<Void>
#endif
private let delay: TimeAmount
private let delay: TimeAmount
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation here also got weird.

internal typealias Element = () -> CallbackList
#endif
@usableFromInline
@usableFromInline
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same indentation issue here.

@usableFromInline typealias WhenCompleteCallback = (Result<Value, Error>) -> Void
#endif
@inlinable
@inlinable
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same indentation issue here.

private var protocolHandlers: Optional<() -> [ChannelHandler]>
#endif
private var _channelInitializer: ChannelInitializerCallback
private var _channelInitializer: ChannelInitializerCallback
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same indentation issue here.

public typealias WorkItem = (WorkItemState) -> Void
#endif
private enum State {
private enum State {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same indentation issue here.

private typealias UpgradePipelineHandler = (Channel, HTTPRequestHead) -> EventLoopFuture<Void>
#endif
/// RFC 6455 specs this as the required entry in the Upgrade header.
/// RFC 6455 specs this as the required entry in the Upgrade header.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same indentation issue here.

@rnro
Copy link
Contributor Author

rnro commented Sep 29, 2023

Thanks for the indentation catches @Lukasa, I went back over my diff and found a couple more.

@rnro rnro requested a review from Lukasa September 29, 2023 08:46
@Lukasa Lukasa added the 🆕 semver/minor Adds new public API. label Oct 2, 2023
@Lukasa Lukasa merged commit 67553a7 into apple:main Oct 2, 2023
@rnro rnro deleted the update_swift_versions branch October 2, 2023 10:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
🆕 semver/minor Adds new public API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants