Swift 5.8 (#72)

* Swift 5.8 * Minimum required swift version is 5.6 * Replace _SotoSendable with Sendable
soto-project · Apr 14, 2023 · 7e8e10d · 7e8e10d
1 parent 8fad5a4
commit 7e8e10d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 86 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,9 +26,9 @@ jobs:
     strategy:
       matrix:
         tag:
-          - swift:5.5
           - swift:5.6
           - swift:5.7
+          - swift:5.8
     container:
       image: ${{ matrix.tag }}
     steps:

diff --git a/[email protected] b/[email protected]
diff --git a/[email protected] b/[email protected]
diff --git a/Sources/SotoCodeGeneratorLib/Templates/api+async.swift b/Sources/SotoCodeGeneratorLib/Templates/api+async.swift
@@ -17,8 +17,6 @@ extension Templates {
     {{%CONTENT_TYPE:TEXT}}
     {{>header}}
 
-    #if compiler(>=5.5.2) && canImport(_Concurrency)
-
     import SotoCore
 
     @available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
@@ -68,7 +66,5 @@ extension Templates {
     {{>waiters_async}}
     {{/waiters}}
 
-    #endif // compiler(>=5.5.2) && canImport(_Concurrency)
-
     """
 }
diff --git a/Sources/SotoCodeGeneratorLib/Templates/enum.swift b/Sources/SotoCodeGeneratorLib/Templates/enum.swift
@@ -16,7 +16,7 @@ extension Templates {
     static let enumTemplate = """
     {{%CONTENT_TYPE:TEXT}}
     {{#isExtensible}}
-        {{scope}} struct {{name}}: RawRepresentable, Equatable, Codable, _SotoSendable {
+        {{scope}} struct {{name}}: RawRepresentable, Equatable, Codable, Sendable {
             {{scope}} var rawValue: String
 
             {{scope}} init(rawValue: String) {
@@ -32,7 +32,7 @@ extension Templates {
         }
     {{/isExtensible}}
     {{^isExtensible}}
-        {{scope}} enum {{name}}: String, CustomStringConvertible, Codable, _SotoSendable {
+        {{scope}} enum {{name}}: String, CustomStringConvertible, Codable, Sendable {
     {{#values}}
     {{#documentation}}
             {{>comment}}

diff --git a/Sources/SotoCodeGeneratorLib/Templates/enumWithValues.swift b/Sources/SotoCodeGeneratorLib/Templates/enumWithValues.swift
@@ -16,7 +16,7 @@ extension Templates {
     static let enumWithValuesTemplate = #"""
     {{! Template for a AWSShape enum with values }}
     {{%CONTENT_TYPE:TEXT}}
-        {{scope}} {{object}} {{name}}: {{shapeProtocol}}, _SotoSendable {
+        {{scope}} {{object}} {{name}}: {{shapeProtocol}}, Sendable {
     {{#namespace}}
             {{scope}} static let _xmlNamespace: String? = "{{.}}"
     {{/namespace}}