feat: Add Swift 6 language mode support #920

dayaffe · 2025-04-14T19:23:45Z

Issue #

Description of changes

Bumps CRT version from 0.48 to 0.52.1 and includes changes from chore: Bump CRT version to 0.51.0 from 0.48.0 #925
Refactor CRTClientEngine to break up long functions
Endpoint properties now is of type EndpointProperty as defined by CRT. A wrapper EndpointPropertyValue is defined to obfuscate CRT dependency
Add github actions workflow that modifies tools version to 6.0 and builds

Scope

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

… an error (#921) Co-authored-by: Sichan Yoo <chanyoo@amazon.com>

dayaffe · 2025-04-17T17:34:01Z

https://github.com/smithy-lang/smithy-swift/actions/runs/14519147076 Passing ✅

dayaffe · 2025-04-17T19:17:39Z

.github/workflows/continuous-integration.yml

Ignore this

dayaffe · 2025-04-17T19:17:48Z

Package.resolved

Ignore this it will be removed

dayaffe · 2025-04-17T19:18:03Z

Package.swift

@@ -56,7 +56,7 @@ let package = Package(
    ],
    dependencies: {
        var dependencies: [Package.Dependency] = [
-            .package(url: "https://github.com/awslabs/aws-crt-swift.git", exact: "0.48.0"),
+            .package(url: "https://github.com/awslabs/aws-crt-swift.git", branch: "swift6-support"),


ignore this

sichanyoo

6 Qs & 1 suggestion

Sources/ClientRuntime/Config/DefaultSDKRuntimeConfiguration.swift

Sources/SmithyHTTPAPI/EndpointPropertyValue.swift

Sources/SmithyHTTPAPI/Endpoint.swift

Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift

…g locks

jbelkins · 2025-04-24T16:22:32Z

Package.resolved

@@ -0,0 +1,33 @@
+{


Package.resolved should be deleted from this PR before merge

Yes it will be

jbelkins · 2025-04-25T15:15:00Z

Sources/ClientRuntime/Networking/Http/CRT/CRTClientEngine.swift

+        private func take() -> CheckedContinuation<Response, Error>? {
+            lock.lock()
+            defer { lock.unlock() }
+            defer { continuation = nil }


Multiple defer statements execute in reverse order they are written, so this is correct, but for simplicity, why not just use one defer with two lines and return a temp var?

I can change it to that if its preferred 👍 -- I wrote out both options and liked this one more.

jbelkins · 2025-04-25T15:30:08Z

Sources/SmithyHTTPAPI/Endpoint.swift


-public struct Endpoint: Hashable {
+public struct Endpoint: Sendable, Equatable {


So we were using Endpoint equality but not hashability?

Yeah we were never hashing this but I assume we marked it as Hashable since properties had [String: AnyHashable]

Do we actually use endpoint equality though?

Its used here

Sources/SmithyHTTPAPI/EndpointPropertyValue.swift

Sources/SmithyHTTPAPI/HTTPRequest.swift

dayaffe and others added 19 commits April 3, 2025 15:25

enable swift 6.0 language mode

a56fb84

try modifying SwiftDependency

8761073

make WaiterError's Output: Sendable

dad0585

more sendable

dc98b6d

more sendable

f759bdb

try removing version string

8ed31c2

swift 6 compatible, all tests passing

1d93807

swiftlint

ebf4060

more sendables

b1491d3

temp add Package.resolved

082c5f1

remove xcbeautify

43b13d1

bump minimum xcode to 15.3

0d41fdc

add back xcbeautify

b672e52

add Event: Sendable and remove 5.9 focal

a7afa38

remove xcbeautify

a8da6ea

remove xcode 15.3 for now

829882d

remove 15.3 and allow xcode 16.1 to run with macos 14

7a7e745

fix: Fix silent failure with CRT HTTP client when response stream has…

67a9feb

… an error (#921) Co-authored-by: Sichan Yoo <chanyoo@amazon.com>

Merge branch 'main' into day/swift6-support

98c6599

dayaffe force-pushed the main branch from 67a9feb to 755367a Compare April 15, 2025 21:16

dayaffe added 2 commits April 16, 2025 16:34

update package.resolved

0e274f5

ktlint

ea89587

Clean up CRTClientEngine & fix failing test

6162f2c

dayaffe commented Apr 17, 2025

View reviewed changes

.github/workflows/continuous-integration.yml Outdated

Copy link

Contributor Author

dayaffe Apr 17, 2025

Choose a reason for hiding this comment

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

Ignore this

dayaffe commented Apr 17, 2025

View reviewed changes

Package.resolved Outdated

Copy link

Contributor Author

dayaffe Apr 17, 2025

Choose a reason for hiding this comment

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

Ignore this it will be removed

dayaffe commented Apr 17, 2025

View reviewed changes

sichanyoo reviewed Apr 18, 2025

View reviewed changes

dayaffe added 2 commits April 18, 2025 14:33

change ContinuationWrapper from actor to synchronous final class usin…

a6a8040

…g locks

remove unnecessary SerialExecutor constructor

f22919f

DefaultAuthSchemeResolver Sendable

bb3bf8d

dayaffe requested a review from sichanyoo April 21, 2025 19:11

sichanyoo approved these changes Apr 22, 2025

View reviewed changes

dayaffe requested a review from jbelkins April 22, 2025 18:01

jbelkins requested changes Apr 25, 2025

View reviewed changes

dayaffe added 3 commits April 25, 2025 17:23

Merge branch 'main' into day/swift6-support

d876045

set smithy tools version to 5.9

2310612

revert CI changes

4735c1d

sichanyoo mentioned this pull request Apr 29, 2025

chore: Bump CRT version to 0.51.0 from 0.48.0 #925

Closed

2 tasks

dayaffe added 3 commits April 29, 2025 17:28

use crt 0.58.1

c638616

version correction

31dca27

address PR comments

72ed616

dayaffe requested review from jbelkins and sichanyoo April 30, 2025 14:58

sichanyoo approved these changes Apr 30, 2025

View reviewed changes

dayaffe added 6 commits May 1, 2025 13:16

try adding CI to edit swift-tools version

f104d7e

try adding new swift6 compat workflow

958a5e3

intentionally remove Sendable to check build

df7c767

add back Sendable

2cb9702

purposefully remove Sendable from HTTPResponse

0fca366

add back Sendable to HTTPResponse

4515eb6

jbelkins approved these changes May 1, 2025

View reviewed changes

dayaffe merged commit 2375537 into main May 1, 2025
32 checks passed

dayaffe deleted the day/swift6-support branch May 1, 2025 21:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add Swift 6 language mode support #920

feat: Add Swift 6 language mode support #920

dayaffe commented Apr 14, 2025 •

edited

Loading

dayaffe commented Apr 17, 2025

dayaffe Apr 17, 2025

dayaffe Apr 17, 2025

dayaffe Apr 17, 2025

sichanyoo left a comment

jbelkins Apr 24, 2025

dayaffe Apr 25, 2025

jbelkins Apr 25, 2025

dayaffe Apr 25, 2025

jbelkins Apr 25, 2025

dayaffe Apr 25, 2025

jbelkins Apr 25, 2025

dayaffe Apr 30, 2025


		public struct Endpoint: Hashable {
		public struct Endpoint: Sendable, Equatable {

feat: Add Swift 6 language mode support #920

feat: Add Swift 6 language mode support #920

Conversation

dayaffe commented Apr 14, 2025 • edited Loading

Issue #

Description of changes

Scope

dayaffe commented Apr 17, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sichanyoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dayaffe commented Apr 14, 2025 •

edited

Loading