Fix Concurrency Warnings in Swift 6 #310
Merged
Conversation
This file contains hidden or 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
# Conflicts: # Source/AwsCommonRuntimeKit/auth/credentials/CredentialsProvider.swift # Test/AwsCommonRuntimeKitTests/XCBaseTestCase.swift # aws-common-runtime/aws-c-common
xiazhvera
approved these changes
Apr 16, 2025
| //extension Dictionary where Key == String, Value == EndpointProperty { | ||
| // /// Converts EndpointProperty to a dictionary of `String`: `AnyHashable` | ||
| // /// - Returns: Dictionary of `String`: `AnyHashable` | ||
| // func toStringHashableDictionary() -> [String: AnyHashable] { |
Contributor
There was a problem hiding this comment.
The function seems not used. Is it safe to remove it?
| ]) | ||
| ])] | ||
| XCTAssertEqual(expectedProperties, properties) | ||
| // let expectedProperties = [ |
TingDaoK
reviewed
Apr 28, 2025
.github/workflows/ci.yml
Outdated
Comment on lines
95
to
96
| sed -i '' 's/swift-tools-version:5\.7/swift-tools-version:6\.0/' Package.swift | ||
| cat Package.swift | head -3 |
Contributor
There was a problem hiding this comment.
if Package.swift doesn't have the exact string swift-tools-version:5.7, this step will just fail silently, which will make it hard to debug and probably leave the CI doesn't do the expected thing for us.
GenAI suggested something like:
Solution 1: Combined sed command with conditional exit
Bash
Copy code
sed -i '' '/swift-tools-version:5\.7/{s/swift-tools-version:5\.7/swift-tools-version:6\.0/;b};q1' Package.swift
This will:
Search for the pattern
If found, make the substitution and branch to end of script (with b)
If not found, exit with code 1 (with q1)
Also, using the exact version seems less future proven. I am not sure if we will ever change the version in the package.swift, but in general, maybe just match all version instead.
Contributor
Author
There was a problem hiding this comment.
Thanks, I have made it more generic so that it works with any 5.xx version and also fails if it can't replace it.
TingDaoK
approved these changes
Apr 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #185
Description of changes:
This PR fixes a bunch of Swift 6 errors (warnings for pre-Swift 6).
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.