Skip to content

[swift6] fix Vapor build, disable swift 5 tests on CI and enable more swift 6 tests on CI#22805

Merged
4brunu merged 9 commits intoOpenAPITools:masterfrom
4brunu:feature/vapor
Jan 25, 2026
Merged

[swift6] fix Vapor build, disable swift 5 tests on CI and enable more swift 6 tests on CI#22805
4brunu merged 9 commits intoOpenAPITools:masterfrom
4brunu:feature/vapor

Conversation

@4brunu
Copy link
Contributor

@4brunu 4brunu commented Jan 25, 2026

[swift6] fix Vapor build, disable swift 5 tests on CI and enable more swift 6 tests on CI

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package || exit
    ./bin/generate-samples.sh ./bin/configs/*.yaml || exit
    ./bin/utils/export_docs_generators.sh || exit
    
    (For Windows users, please run the script in WSL)
    Commit all changed files.
    This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
    These must match the expectations made by your contribution.
    You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
    IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
  • File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR solves a reported issue, reference it using GitHub's linking syntax (e.g., having "fixes #123" present in the PR description)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11) @dydus0x14 (2023/06)


Summary by cubic

Fixes the Swift 6 Vapor client build and enables it in CI. Disables Swift 5 tests and updates templates and samples to compile cleanly with Swift 6 and Vapor 4.99+.

  • Bug Fixes

    • Vapor templates compile on Swift 6: apiWrapper is @sendable; ContentConfiguration is explicitly typed.
    • Added retroactive Content/ResponseEncodable and AsyncResponseEncodable conformances (e.g., Set).
    • Raw API methods now accept an apiConfiguration parameter (defaulted).
    • Package.swift uses .product(name: "Vapor", package: "vapor") and requires Vapor >= 4.99.
    • Sample Vapor models switch to structs and Sendable; generated equals/hash code removed.
    • CI: disable Swift 5 tests; enable Swift 6 PromiseKit and Vapor sample builds.
  • Migration

    • Requires Swift 6 toolchain and Vapor >= 4.99.
    • Custom apiWrapper closures must be @sendable.
    • Raw API methods include an optional apiConfiguration argument; existing calls continue to work.
    • If you rely on class-based models, regenerate; samples now default to structs (useClasses: false).

Written for commit 44c9160. Summary will update on new commits.

Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3 issues found across 62 files

Prompt for AI agents (all issues)

Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="modules/openapi-generator/src/main/resources/swift6/api.mustache">

<violation number="1" location="modules/openapi-generator/src/main/resources/swift6/api.mustache:358">
P2: Default headers ignore the passed `apiConfiguration`, so callers using a custom configuration still send shared headers. Use the provided configuration for the default headers to keep behavior consistent.</violation>

<violation number="2" location="modules/openapi-generator/src/main/resources/swift6/api.mustache:438">
P2: Default headers ignore the supplied `apiConfiguration`, so callers using a custom configuration still send shared headers. Make the default headers derive from the provided configuration.</violation>
</file>

<file name="modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache">

<violation number="1" location="modules/openapi-generator/src/main/resources/swift6/Package.swift.mustache:45">
P2: Missing comma after the Vapor dependency will generate invalid Package.swift when additional dependencies are enabled. Add a trailing comma inside the useVapor block.</violation>
</file>

Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.

@4brunu
Copy link
Contributor Author

4brunu commented Jan 25, 2026

CI Failure is not related to this PR.

@4brunu 4brunu merged commit a0dc0e2 into OpenAPITools:master Jan 25, 2026
16 of 17 checks passed
@4brunu 4brunu deleted the feature/vapor branch January 25, 2026 19:59
kingofdisasterr pushed a commit to kingofdisasterr/openapi-generator that referenced this pull request Jan 27, 2026
@wing328 wing328 added this to the 7.20.0 milestone Feb 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants