Skip to content

Commit

Permalink
Merge branch 'main' into defs
Browse files Browse the repository at this point in the history
  • Loading branch information
mattpolzin authored Jun 16, 2024
2 parents d158c00 + 104d9e0 commit 3070c0e
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [pull_request]
jobs:
codecov:
container:
image: swift:5.7
image: swift:5.8
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ jobs:
- swift:5.9-focal
- swift:5.9-jammy
- swift:5.9-amazonlinux2
- swift:5.10-focal
- swift:5.10-jammy
- swift:5.10-amazonlinux2
- swiftlang/swift:nightly-bionic
- swiftlang/swift:nightly-focal
- swiftlang/swift:nightly-jammy
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ let encodedOpenAPIDoc = try encoder.encode(openAPIDoc)
### Validating OpenAPI Documents
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.

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

```swift
let openAPIDoc: OpenAPI.Document = ...
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenAPIKit/Operation/DereferencedOperation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public struct DereferencedOperation: Equatable {
/// If defined, overrides the security requirements in the
/// root document `security` array.
///
/// Each secutity requirement in this array is an alternative, only
/// Each security requirement in this array is an alternative, only
/// one of which must be met for the request to be authorized.
///
/// By contrast, all entries in an individual `DereferencedSecurityRequirement`
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenAPIKit/Operation/Operation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ extension OpenAPI {
/// If defined, overrides the security requirements in the
/// root `OpenAPI.Document` `security` array.
///
/// Each secutity requirement in this array is an alternative, only
/// Each security requirement in this array is an alternative, only
/// one of which must be met for the request to be authorized.
///
/// By contrast, all entries in an individual `SecurityRequirement`
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenAPIKit30/Operation/DereferencedOperation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public struct DereferencedOperation: Equatable {
/// If defined, overrides the security requirements in the
/// root document `security` array.
///
/// Each secutity requirement in this array is an alternative, only
/// Each security requirement in this array is an alternative, only
/// one of which must be met for the request to be authorized.
///
/// By contrast, all entries in an individual `DereferencedSecurityRequirement`
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenAPIKit30/Operation/Operation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ extension OpenAPI {
/// If defined, overrides the security requirements in the
/// root `OpenAPI.Document` `security` array.
///
/// Each secutity requirement in this array is an alternative, only
/// Each security requirement in this array is an alternative, only
/// one of which must be met for the request to be authorized.
///
/// By contrast, all entries in an individual `SecurityRequirement`
Expand Down
2 changes: 2 additions & 0 deletions Sources/OpenAPIKitCore/AnyCodable/AnyCodable.swift
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ extension AnyCodable: Equatable {
return lhs == rhs
case let (lhs as String, rhs as String):
return lhs == rhs
case let (lhs as URL, rhs as URL):
return lhs == rhs
case let (lhs as [String: String], rhs as [String: String]):
return lhs == rhs
case let (lhs as [String: Int], rhs as [String: Int]):
Expand Down
1 change: 1 addition & 0 deletions Tests/AnyCodableTests/AnyCodableTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class AnyCodableTests: XCTestCase {
XCTAssertEqual(AnyCodable(Float(2)), AnyCodable(Float(2)))
XCTAssertEqual(AnyCodable(Double(2)), AnyCodable(Double(2)))
XCTAssertEqual(AnyCodable("hi"), AnyCodable("hi"))
XCTAssertEqual(AnyCodable(URL(string: "file://./params/name.json")), AnyCodable(URL(string: "file://./params/name.json")))
XCTAssertEqual(AnyCodable(["hi": AnyCodable(2)]), AnyCodable(["hi": AnyCodable(2)]))
XCTAssertEqual(AnyCodable([AnyCodable("hi"), AnyCodable("there")]), AnyCodable([AnyCodable("hi"), AnyCodable("there")]))
XCTAssertEqual(AnyCodable(["hi":1]), AnyCodable(["hi":1]))
Expand Down

0 comments on commit 3070c0e

Please sign in to comment.