Skip to content

Upgrade Swift OpenAPI Generator To 1.13.0 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dinoconstantinou87 merged 2 commits into from
Sep 23, 2026
Merged

Upgrade Swift OpenAPI Generator To 1.13.0 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdc8efe
Upgrade Swift OpenAPI Generator To 1.13.0
dinoconstantinou87 Sep 23, 2026
0c6fac0
Re-Clone The Generator And Clear Generated Sources When The Tag Changes
dinoconstantinou87 Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
uses: actions/cache@v5
with:
path: .swift-openapi-generator
key: openapi-generator-1.10.2
key: openapi-generator-1.13.0

- name: Cache SPM build
if: steps.detect.outputs.skip != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
uses: actions/cache@v5
with:
path: .swift-openapi-generator
key: openapi-generator-1.10.2-${{ runner.os }}-${{ runner.arch }}-${{ env.SWIFT_BUILD_ID }}
key: openapi-generator-1.13.0-${{ runner.os }}-${{ runner.arch }}-${{ env.SWIFT_BUILD_ID }}

- name: Cache static Linux SDK
id: sdk-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: actions/cache@v5
with:
path: .swift-openapi-generator
key: openapi-generator-1.10.2
key: openapi-generator-1.13.0

- name: Cache SPM build
uses: actions/cache@v5
Expand Down
12 changes: 8 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# The following values can be changed here, or passed on the command line.
SWIFT_OPENAPI_GENERATOR_GIT_URL ?= https://github.com/apple/swift-openapi-generator
SWIFT_OPENAPI_GENERATOR_GIT_TAG ?= 1.10.2
SWIFT_OPENAPI_GENERATOR_GIT_TAG ?= 1.13.0
SWIFT_OPENAPI_GENERATOR_CLONE_DIR ?= $(CURRENT_MAKEFILE_DIR)/.swift-openapi-generator
SWIFT_OPENAPI_GENERATOR_BUILD_CONFIGURATION ?= debug
OPENAPI_YAML_PATH ?= $(CURRENT_MAKEFILE_DIR)/openapi-bundled.yaml
Expand All @@ -18,6 +18,7 @@ OPENAPI_SOURCE_ROOT ?= $(OPENAPI_SOURCE_DIR)/openapi.yaml
CURRENT_MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
CURRENT_MAKEFILE_DIR := $(patsubst %/,%,$(dir $(CURRENT_MAKEFILE_PATH)))
SWIFT_OPENAPI_GENERATOR_BIN := $(SWIFT_OPENAPI_GENERATOR_CLONE_DIR)/.build/$(SWIFT_OPENAPI_GENERATOR_BUILD_CONFIGURATION)/swift-openapi-generator
SWIFT_OPENAPI_GENERATOR_CLONE_STAMP := $(SWIFT_OPENAPI_GENERATOR_CLONE_DIR)/.cloned-$(SWIFT_OPENAPI_GENERATOR_GIT_TAG)
OPENAPI_BUNDLER_BIN := $(CURRENT_MAKEFILE_DIR)/.build/debug/OpenAPIBundler
OPENAPI_SOURCE_FILES := $(shell find $(OPENAPI_SOURCE_DIR) -name '*.yaml' 2>/dev/null)
API_VERSION := $(shell grep -m1 '^ version:' "$(OPENAPI_SOURCE_ROOT)" | tr -d " '\"" | cut -d: -f2)
Expand Down Expand Up @@ -78,6 +79,7 @@ dump: # Dump all derived values used by the Makefile.
@echo "SWIFT_OPENAPI_GENERATOR_CLONE_DIR = $(SWIFT_OPENAPI_GENERATOR_CLONE_DIR)"
@echo "SWIFT_OPENAPI_GENERATOR_BUILD_CONFIGURATION = $(SWIFT_OPENAPI_GENERATOR_BUILD_CONFIGURATION)"
@echo "SWIFT_OPENAPI_GENERATOR_BIN = $(SWIFT_OPENAPI_GENERATOR_BIN)"
@echo "SWIFT_OPENAPI_GENERATOR_CLONE_STAMP = $(SWIFT_OPENAPI_GENERATOR_CLONE_STAMP)"
@echo "OPENAPI_YAML_PATH = $(OPENAPI_YAML_PATH)"
@echo "OPENAPI_GENERATOR_CONFIG_PATH = $(OPENAPI_GENERATOR_CONFIG_PATH)"
@echo "OUTPUT_DIRECTORY = $(OUTPUT_DIRECTORY)"
Expand All @@ -86,16 +88,18 @@ dump: # Dump all derived values used by the Makefile.
@echo "OPENAPI_SOURCE_DIR = $(OPENAPI_SOURCE_DIR)"
@echo "OPENAPI_SOURCE_ROOT = $(OPENAPI_SOURCE_ROOT)"

$(SWIFT_OPENAPI_GENERATOR_CLONE_DIR):
$(SWIFT_OPENAPI_GENERATOR_CLONE_STAMP):
rm -rf "$(SWIFT_OPENAPI_GENERATOR_CLONE_DIR)" "$(OUTPUT_DIRECTORY)"
git \
-c advice.detachedHead=false \
clone \
--branch "$(SWIFT_OPENAPI_GENERATOR_GIT_TAG)" \
--depth 1 \
"$(SWIFT_OPENAPI_GENERATOR_GIT_URL)" \
$@
"$(SWIFT_OPENAPI_GENERATOR_CLONE_DIR)"
touch "$@"

$(SWIFT_OPENAPI_GENERATOR_BIN): $(SWIFT_OPENAPI_GENERATOR_CLONE_DIR)
$(SWIFT_OPENAPI_GENERATOR_BIN): $(SWIFT_OPENAPI_GENERATOR_CLONE_STAMP)
swift \
build \
--package-path "$(SWIFT_OPENAPI_GENERATOR_CLONE_DIR)" \
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let package = Package(
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.5.0"),
.package(url: "https://github.com/apple/swift-configuration.git", from: "1.2.1"),
.package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.8.2"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.11.0"),
.package(url: "https://github.com/apple/swift-openapi-urlsession", from: "1.3.0"),
.package(url: "https://github.com/tuist/Noora", from: "0.50.0"),
.package(url: "https://github.com/swhitty/FlyingFox", from: "0.27.1"),
Expand Down