From 7f9e6292df5a8b218a023e954f7c3dc639634e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=CC=8Cimon=20S=CC=8Cesta=CC=81k?= Date: Wed, 7 Jan 2026 15:25:25 +0100 Subject: [PATCH 1/2] ci: Update macOS GitHub Actions workflows to newer versions Migrate workflows to use macOS 14 and 15 runners, update actions/checkout to v4, and remove redundant Xcode setup. --- .github/workflows/{macos-10.15.yml => macos-14.yml} | 6 +++--- .github/workflows/{macos-11.yml => macos-15.yml} | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) rename .github/workflows/{macos-10.15.yml => macos-14.yml} (84%) rename .github/workflows/{macos-11.yml => macos-15.yml} (68%) diff --git a/.github/workflows/macos-10.15.yml b/.github/workflows/macos-14.yml similarity index 84% rename from .github/workflows/macos-10.15.yml rename to .github/workflows/macos-14.yml index 9297bc4..5602b3e 100644 --- a/.github/workflows/macos-10.15.yml +++ b/.github/workflows/macos-14.yml @@ -1,4 +1,4 @@ -name: macOS 10.15 +name: macOS 14 on: push: @@ -10,10 +10,10 @@ on: jobs: test: - runs-on: macos-10.15 + runs-on: macos-14 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Lint run: | swiftlint --strict diff --git a/.github/workflows/macos-11.yml b/.github/workflows/macos-15.yml similarity index 68% rename from .github/workflows/macos-11.yml rename to .github/workflows/macos-15.yml index e29fc66..b814c45 100644 --- a/.github/workflows/macos-11.yml +++ b/.github/workflows/macos-15.yml @@ -1,4 +1,4 @@ -name: macOS 11 +name: macOS 15 on: push: @@ -10,14 +10,10 @@ on: jobs: test: - runs-on: macos-11 + runs-on: macos-15 steps: - - uses: actions/checkout@v2 - - name: Setup Xcode version - uses: maxim-lobanov/setup-xcode@v1.4.0 - with: - xcode-version: 13.1 + - uses: actions/checkout@v4 - name: Lint run: | swiftlint --strict From dbdfbe9d7ce345fde333d35a4d3ddd3655d6c3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=CC=8Cimon=20S=CC=8Cesta=CC=81k?= Date: Wed, 7 Jan 2026 15:26:43 +0100 Subject: [PATCH 2/2] chore: Unify Swift Package Manager configuration The project can now use a single Package.swift for both building and DocC generation by updating the tools version to 5.5. --- Package.swift | 2 +- Package@swift-5.5.swift | 33 --------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 Package@swift-5.5.swift diff --git a/Package.swift b/Package.swift index 9c456de..fb466b5 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.5 import PackageDescription diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift deleted file mode 100644 index 24cfcb2..0000000 --- a/Package@swift-5.5.swift +++ /dev/null @@ -1,33 +0,0 @@ -// swift-tools-version:5.5 -// This manifest is needed to properly generate DocC documentation. - -import PackageDescription - -let package = Package( - name: "FTAPIKit", - platforms: [ - .iOS(.v14), - .macOS(.v11), - .tvOS(.v14), - .watchOS(.v7) - ], - products: [ - .library( - name: "FTAPIKit", - targets: ["FTAPIKit"]) - ], - dependencies: [ - .package(url: "https://github.com/futuredapp/FTNetworkTracer", from: "0.2.0") - ], - targets: [ - .target( - name: "FTAPIKit", - dependencies: [ - .product(name: "FTNetworkTracer", package: "FTNetworkTracer") - ] - ), - .testTarget( - name: "FTAPIKitTests", - dependencies: ["FTAPIKit"]) - ] -)