Skip to content

Commit d267e29

Browse files
authored
Merge pull request #476 from mattpolzin/feature/474/update-oas-links
update documentation around OAS versions
2 parents e229b90 + 801c332 commit d267e29

31 files changed

+56
-55
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@ Thank you for considering contributing to OpenAPIKit!
22

33
Take a look at the [Code of Conduct](https://github.com/mattpolzin/OpenAPIKit/blob/master/CODE_OF_CONDUCT.md) and note the [MIT license](https://github.com/mattpolzin/OpenAPIKit/blob/master/LICENSE.txt) associated with this project.
44

5-
If you are preparing a change for the current release of OpenAPIKit (major version 4), branch off of the `main` branch of this repositroy. If you are preparing a fix for version 3 of OpenAPIKit, branch off of the `release/3_x` branch of this repository. If you are preparing a change for the next major release of OpenAPIKit (major version `5`), branch off of the `release/5_0` branch of this repository.
5+
If you are preparing a change for the current release of OpenAPIKit (major version 5), branch off of the `main` branch of this repositroy. If you are preparing a fix for version 4 of OpenAPIKit, branch off of the `release/4_x` branch of this repository. If you are preparing a change for the next major release of OpenAPIKit (major version `6`), branch off of the `release/6_0` branch of this repository.
66

77
Please do the following in the course of preparing a branch and pull request for this project.
88

99
- Create an issue motivating the changes you want to make if one does not already exist. If you are unsure of how to adress an issue, seek out converstation on the issue before committing to a strategy.
1010
- Add test cases that cover the logical branches of your addition. For bug fixes, at least one of your test cases should fail prior to your change to serve as a regression test against the bug being fixed.
1111
- If relevant, cite the OpenAPI specification in describing your changes.
12-
- If your changes only apply for OpenAPI 3.1.x documents, modify the `OpenAPIKit` module. If your changes only apply for OpenAPI 3.0.x documents, modify the `OpenAPIKit30` module. If your changes apply to both, please port your changes from one to the other so both are updated if you have time. If you don't have time to apply changes to both modules, create a PR and ask for assistance with porting your changes. If you are not sure whether your changes apply to both modules, you can also create a PR and then ask for clarification.
12+
- If your changes only apply for OpenAPI 3.1.x and 3.2.x documents, modify the `OpenAPIKit` module. If your changes only apply for OpenAPI 3.0.x documents, modify the `OpenAPIKit30` module. If your changes apply to both, please port your changes from one to the other so both are updated if you have time. If you don't have time to apply changes to both modules, create a PR and ask for assistance with porting your changes. If you are not sure whether your changes apply to both modules, you can also create a PR and then ask for clarification.
13+
- If your changes only apply to OpenAPI 3.2.x documents, add "conditional warnings" so that the `OpenAPIKit` module can support the OAS 3.2.x feature but also warn if an OAS 3.1.x document uses that feature. See existing types with `HasConditionalWarnings` protocol conformance for examples.
1314

1415
### Goals for each currently maintained major version
1516

16-
`3.x`: Non-breaking changes that fix bugs or add improvements to the support of either OpenAPI Spec v3.0.x or OpenAPI Spec v3.1.x.
17-
`4.x`: Non-breaking changes that fix bugs or add improvements to the support of OpenAPI Spec v3.0.x, OpenAPI Spec v3.1.x, external dereferencing, or Swift concurrency.
17+
`4.x`: Non-breaking changes that fix bugs or add improvements to the support of either OpenAPI Spec v3.0.x or OpenAPI Spec v3.1.x.
18+
`5.x`: Non-breaking changes that fix bugs or add improvements to the support of OpenAPI Spec v3.0.x, OpenAPI Spec v3.1.x, or OpenAPI Spec v3.2.x.
1819

1920
#### Goals for the Next/unreleased version
20-
The next major version will be `5.0`.
21+
The next major version will be `6.0`.
2122

2223
Priorities for this release have not been settled on yet.
2324

Sources/OpenAPIKit/Callbacks.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extension OpenAPI {
1313
/// A map from runtime expressions to path items to be used as
1414
/// callbacks for the API. The OpenAPI Spec "Callback Object."
1515
///
16-
/// See [OpenAPI Callback Object](https://spec.openapis.org/oas/v3.1.1.html#callback-object).
16+
/// See [OpenAPI Callback Object](https://spec.openapis.org/oas/v3.2.0.html#callback-object).
1717
///
1818
public typealias Callbacks = OrderedDictionary<CallbackURL, Either<OpenAPI.Reference<PathItem>, PathItem>>
1919

Sources/OpenAPIKit/Components Object/Components.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Foundation
1111
extension OpenAPI {
1212
/// OpenAPI Spec "Components Object".
1313
///
14-
/// See [OpenAPI Components Object](https://spec.openapis.org/oas/v3.1.1.html#components-object).
14+
/// See [OpenAPI Components Object](https://spec.openapis.org/oas/v3.2.0.html#components-object).
1515
///
1616
/// This is a place to put reusable components to
1717
/// be referenced from other parts of the spec.

Sources/OpenAPIKit/Content/Content.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import OpenAPIKitCore
1010
extension OpenAPI {
1111
/// OpenAPI Spec "Media Type Object"
1212
///
13-
/// See [OpenAPI Media Type Object](https://spec.openapis.org/oas/v3.1.1.html#media-type-object).
13+
/// See [OpenAPI Media Type Object](https://spec.openapis.org/oas/v3.2.0.html#media-type-object).
1414
public struct Content: HasConditionalWarnings, CodableVendorExtendable, Sendable {
1515
/// A schema describing the complete content of the request, response,
1616
/// parameter, or header.

Sources/OpenAPIKit/Content/ContentEncoding.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import OpenAPIKitCore
1010
extension OpenAPI.Content {
1111
/// OpenAPI Spec "Encoding Object"
1212
///
13-
/// See [OpenAPI Encoding Object](https://spec.openapis.org/oas/v3.1.1.html#encoding-object).
13+
/// See [OpenAPI Encoding Object](https://spec.openapis.org/oas/v3.2.0.html#encoding-object).
1414
public struct Encoding: Equatable, CodableVendorExtendable, Sendable {
1515
public typealias Style = OpenAPI.Parameter.SchemaContext.Style
1616

Sources/OpenAPIKit/Document/DereferencedDocument.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extension DereferencedDocument {
105105
/// each path, traversed in the order the paths appear in
106106
/// the document.
107107
///
108-
/// See [Operation Object](https://spec.openapis.org/oas/v3.1.1.html#operation-object) in the specifcation.
108+
/// See [Operation Object](https://spec.openapis.org/oas/v3.2.0.html#operation-object) in the specifcation.
109109
///
110110
public var allOperationIds: [String] {
111111
return paths.values

Sources/OpenAPIKit/Document/Document.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Foundation
1111
extension OpenAPI {
1212
/// The root of an OpenAPI 3.1 document.
1313
///
14-
/// See [OpenAPI Specification](https://spec.openapis.org/oas/v3.1.1.html).
14+
/// See [OpenAPI Specification](https://spec.openapis.org/oas/v3.2.0.html).
1515
///
1616
/// An OpenAPI Document can say a _lot_ about the API it describes.
1717
/// A read-through of the specification is highly recommended because
@@ -104,7 +104,7 @@ extension OpenAPI {
104104
///
105105
/// Closely related to the callbacks feature, this section describes requests initiated other than by an API call, for example by an out of band registration.
106106
/// The key name is a unique string to refer to each webhook, while the (optionally referenced) Path Item Object describes a request that may be initiated by the API provider and the expected responses
107-
/// See [OpenAPI Webhook Object](https://spec.openapis.org/oas/v3.1.1.html#fixed-fields)
107+
/// See [OpenAPI Webhook Object](https://spec.openapis.org/oas/v3.2.0.html#fixed-fields)
108108
public var webhooks: OrderedDictionary<String, Either<OpenAPI.Reference<OpenAPI.PathItem>, OpenAPI.PathItem>>
109109

110110
/// A declaration of which security mechanisms can be used across the API.
@@ -262,7 +262,7 @@ extension OpenAPI.Document {
262262
/// each path, traversed in the order the paths appear in
263263
/// the document.
264264
///
265-
/// See [Operation Object](https://spec.openapis.org/oas/v3.1.1.html#operation-object) in the specifcation.
265+
/// See [Operation Object](https://spec.openapis.org/oas/v3.2.0.html#operation-object) in the specifcation.
266266
///
267267
public var allOperationIds: [String] {
268268
return (paths.values + webhooks.values)
@@ -446,7 +446,7 @@ extension OpenAPI {
446446
/// Multiple entries in this dictionary indicate all schemes named are
447447
/// required on the same request.
448448
///
449-
/// See [OpenAPI Security Requirement Object](https://spec.openapis.org/oas/v3.1.1.html#security-requirement-object).
449+
/// See [OpenAPI Security Requirement Object](https://spec.openapis.org/oas/v3.2.0.html#security-requirement-object).
450450
public typealias SecurityRequirement = [JSONReference<SecurityScheme>: [String]]
451451
}
452452

Sources/OpenAPIKit/Document/DocumentInfo.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Foundation
1111
extension OpenAPI.Document {
1212
/// OpenAPI Spec "Info Object"
1313
///
14-
/// See [OpenAPI Info Object](https://spec.openapis.org/oas/v3.1.1.html#info-object).
14+
/// See [OpenAPI Info Object](https://spec.openapis.org/oas/v3.2.0.html#info-object).
1515
public struct Info: Equatable, CodableVendorExtendable, Sendable {
1616
public var title: String
1717
public var summary: String?
@@ -50,7 +50,7 @@ extension OpenAPI.Document {
5050

5151
/// OpenAPI Spec "Contact Object"
5252
///
53-
/// See [OpenAPI Contact Object](https://spec.openapis.org/oas/v3.1.1.html#contact-object).
53+
/// See [OpenAPI Contact Object](https://spec.openapis.org/oas/v3.2.0.html#contact-object).
5454
public struct Contact: Equatable, CodableVendorExtendable, Sendable {
5555
public let name: String?
5656
public let url: URL?
@@ -78,7 +78,7 @@ extension OpenAPI.Document {
7878

7979
/// OpenAPI Spec "License Object"
8080
///
81-
/// See [OpenAPI License Object](https://spec.openapis.org/oas/v3.1.1.html#license-object).
81+
/// See [OpenAPI License Object](https://spec.openapis.org/oas/v3.2.0.html#license-object).
8282
public struct License: Equatable, CodableVendorExtendable, Sendable {
8383
public let name: String
8484
public let identifier: Identifier?

Sources/OpenAPIKit/ExternalDocumentation.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Foundation
1111
extension OpenAPI {
1212
/// OpenAPI Spec "External Documentation Object"
1313
///
14-
/// See [OpenAPI External Documentation Object](https://spec.openapis.org/oas/v3.1.1.html#external-documentation-object).
14+
/// See [OpenAPI External Documentation Object](https://spec.openapis.org/oas/v3.2.0.html#external-documentation-object).
1515
public struct ExternalDocumentation: Equatable, CodableVendorExtendable, Sendable {
1616
public var description: String?
1717
public var url: URL

Sources/OpenAPIKit/Header/Header.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import OpenAPIKitCore
1010
extension OpenAPI {
1111
/// OpenAPI Spec "Header Object"
1212
///
13-
/// See [OpenAPI Header Object](https://spec.openapis.org/oas/v3.1.1.html#header-object).
13+
/// See [OpenAPI Header Object](https://spec.openapis.org/oas/v3.2.0.html#header-object).
1414
public struct Header: Equatable, CodableVendorExtendable, Sendable {
1515
public typealias SchemaContext = Parameter.SchemaContext
1616

0 commit comments

Comments
 (0)