Skip to content

Commit e4f4975

Browse files
authored
Add swift 6.1 CI (#634)
1 parent d2b2726 commit e4f4975

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
- 'swift:5.9'
4444
- 'swift:5.10'
4545
- 'swift:6.0'
46+
- 'swiftlang/swift:nightly-6.1-jammy'
4647
container:
4748
image: ${{ matrix.image }}
4849
steps:

Sources/SotoCore/AWSShapes/Base64Data.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public struct AWSBase64Data: Sendable, Codable, Equatable {
2424

2525
/// construct `AWSBase64Data` from raw data
2626
public static func data(_ data: some Collection<UInt8>) -> Self {
27-
.init(base64String: String(base64Encoding: data))
27+
.init(base64String: String(_base64Encoding: data, options: []))
2828
}
2929

3030
/// construct `AWSBase64Data` from base64 encoded data
@@ -51,6 +51,6 @@ public struct AWSBase64Data: Sendable, Codable, Equatable {
5151

5252
/// return blob as Data
5353
public func decoded() -> [UInt8]? {
54-
try? self.base64String.base64decoded()
54+
try? self.base64String._base64Decoded()
5555
}
5656
}

Sources/SotoCore/Utils/base64.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@
7171
// MARK: - Extensions -
7272

7373
extension String {
74-
init(base64Encoding bytes: some Collection<UInt8>, options: Base64.EncodingOptions = []) {
74+
init(_base64Encoding bytes: some Collection<UInt8>, options: Base64.EncodingOptions = []) {
7575
self = Base64.encodeString(bytes: bytes, options: options)
7676
}
7777

78-
func base64decoded(options: Base64.DecodingOptions = []) throws -> [UInt8] {
78+
func _base64Decoded(options: Base64.DecodingOptions = []) throws -> [UInt8] {
7979
try Base64.decode(string: self, options: options)
8080
}
8181
}

Sources/SotoXML/Expat.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
// Licensed under Apache License v2.0 http://www.apache.org/licenses/LICENSE-2.0.html
1919
//
2020

21+
#if compiler(>=6.0)
22+
internal import CSotoExpat
23+
#else
2124
@_implementationOnly import CSotoExpat
25+
#endif
2226

2327
#if canImport(Glibc)
2428
import Glibc

0 commit comments

Comments
 (0)