Skip to content

Commit 3070c0e

Browse files
authored
Merge branch 'main' into defs
2 parents d158c00 + 104d9e0 commit 3070c0e

File tree

9 files changed

+12
-6
lines changed

9 files changed

+12
-6
lines changed

.github/workflows/codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [pull_request]
55
jobs:
66
codecov:
77
container:
8-
image: swift:5.7
8+
image: swift:5.8
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v3

.github/workflows/tests.yml

+3
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ jobs:
7676
- swift:5.9-focal
7777
- swift:5.9-jammy
7878
- swift:5.9-amazonlinux2
79+
- swift:5.10-focal
80+
- swift:5.10-jammy
81+
- swift:5.10-amazonlinux2
7982
- swiftlang/swift:nightly-bionic
8083
- swiftlang/swift:nightly-focal
8184
- swiftlang/swift:nightly-jammy

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ let encodedOpenAPIDoc = try encoder.encode(openAPIDoc)
108108
### Validating OpenAPI Documents
109109
Thanks to Swift's type system, the vast majority of the OpenAPI Specification is represented by the types of OpenAPIKit -- you cannot create bad OpenAPI docuements in the first place and decoding a document will fail with generally useful errors.
110110

111-
That being said, there are a small number of additional checks that you can perform to really put any concerns to bed.
111+
That being said, there are a small number of additional checks that you can perform to really put any concerns to rest.
112112

113113
```swift
114114
let openAPIDoc: OpenAPI.Document = ...

Sources/OpenAPIKit/Operation/DereferencedOperation.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct DereferencedOperation: Equatable {
2828
/// If defined, overrides the security requirements in the
2929
/// root document `security` array.
3030
///
31-
/// Each secutity requirement in this array is an alternative, only
31+
/// Each security requirement in this array is an alternative, only
3232
/// one of which must be met for the request to be authorized.
3333
///
3434
/// By contrast, all entries in an individual `DereferencedSecurityRequirement`

Sources/OpenAPIKit/Operation/Operation.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ extension OpenAPI {
8686
/// If defined, overrides the security requirements in the
8787
/// root `OpenAPI.Document` `security` array.
8888
///
89-
/// Each secutity requirement in this array is an alternative, only
89+
/// Each security requirement in this array is an alternative, only
9090
/// one of which must be met for the request to be authorized.
9191
///
9292
/// By contrast, all entries in an individual `SecurityRequirement`

Sources/OpenAPIKit30/Operation/DereferencedOperation.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct DereferencedOperation: Equatable {
2828
/// If defined, overrides the security requirements in the
2929
/// root document `security` array.
3030
///
31-
/// Each secutity requirement in this array is an alternative, only
31+
/// Each security requirement in this array is an alternative, only
3232
/// one of which must be met for the request to be authorized.
3333
///
3434
/// By contrast, all entries in an individual `DereferencedSecurityRequirement`

Sources/OpenAPIKit30/Operation/Operation.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ extension OpenAPI {
8686
/// If defined, overrides the security requirements in the
8787
/// root `OpenAPI.Document` `security` array.
8888
///
89-
/// Each secutity requirement in this array is an alternative, only
89+
/// Each security requirement in this array is an alternative, only
9090
/// one of which must be met for the request to be authorized.
9191
///
9292
/// By contrast, all entries in an individual `SecurityRequirement`

Sources/OpenAPIKitCore/AnyCodable/AnyCodable.swift

+2
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ extension AnyCodable: Equatable {
186186
return lhs == rhs
187187
case let (lhs as String, rhs as String):
188188
return lhs == rhs
189+
case let (lhs as URL, rhs as URL):
190+
return lhs == rhs
189191
case let (lhs as [String: String], rhs as [String: String]):
190192
return lhs == rhs
191193
case let (lhs as [String: Int], rhs as [String: Int]):

Tests/AnyCodableTests/AnyCodableTests.swift

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class AnyCodableTests: XCTestCase {
2929
XCTAssertEqual(AnyCodable(Float(2)), AnyCodable(Float(2)))
3030
XCTAssertEqual(AnyCodable(Double(2)), AnyCodable(Double(2)))
3131
XCTAssertEqual(AnyCodable("hi"), AnyCodable("hi"))
32+
XCTAssertEqual(AnyCodable(URL(string: "file://./params/name.json")), AnyCodable(URL(string: "file://./params/name.json")))
3233
XCTAssertEqual(AnyCodable(["hi": AnyCodable(2)]), AnyCodable(["hi": AnyCodable(2)]))
3334
XCTAssertEqual(AnyCodable([AnyCodable("hi"), AnyCodable("there")]), AnyCodable([AnyCodable("hi"), AnyCodable("there")]))
3435
XCTAssertEqual(AnyCodable(["hi":1]), AnyCodable(["hi":1]))

0 commit comments

Comments
 (0)