Skip to content

Commit f23fdf4

Browse files
authored
Merge pull request #428 from mattpolzin/release/5_0
branch tracking release v5.0.0 changes (OAS 3.2.0)
2 parents 67ab9cb + c2867ce commit f23fdf4

140 files changed

Lines changed: 8216 additions & 1958 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
image:
16-
- swift:5.8-focal
17-
- swift:5.8-jammy
18-
- swift:5.9-focal
19-
- swift:5.9-jammy
2016
- swift:5.10-focal
2117
- swift:5.10-jammy
2218
- swift:6.0-focal
@@ -25,8 +21,10 @@ jobs:
2521
- swift:6.1-focal
2622
- swift:6.1-jammy
2723
- swift:6.1-noble
24+
- swift:6.2-jammy
25+
- swift:6.2-noble
2826
- swiftlang/swift:nightly-focal
29-
- swiftlang/swift:nightly-jammy
27+
# - swiftlang/swift:nightly-jammy
3028
container: ${{ matrix.image }}
3129
steps:
3230
- name: Checkout code

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

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
// swift-tools-version: 5.8
1+
// swift-tools-version: 5.10
22

33
import PackageDescription
44

55
let package = Package(
66
name: "OpenAPIKit",
77
platforms: [
88
.macOS(.v10_15),
9-
.iOS(.v11)
9+
.iOS(.v12)
1010
],
1111
products: [
1212
.library(

0 commit comments

Comments
 (0)