From 3fe2f9ab066dab21d2562298af3e3cd70997894f Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Mon, 23 Dec 2024 08:38:52 +0100 Subject: [PATCH 1/2] Increase the `Swift` version to 6.0 (#15) * Increase the Swift version to 6.0 * Update `ci.yml` * Update `CHANGELOG.md` --- .github/workflows/ci.yml | 58 ++++++++++++++++++++++++++++++++++++---- .swiftlint.yml | 4 ++- CHANGELOG.md | 8 +++++- Package.swift | 2 +- Package@swift-5.10.swift | 23 ++++++++++++++++ Package@swift-5.9.swift | 23 ++++++++++++++++ 6 files changed, 110 insertions(+), 8 deletions(-) create mode 100644 Package@swift-5.10.swift create mode 100644 Package@swift-5.9.swift diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25bc0fd..e7c990c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,12 @@ jobs: fail-fast: false matrix: include: + - xcode: "Xcode_16.0" + runsOn: macOS-14 + name: "macOS 14, Xcode 16.0, Swift 6.0" + - xcode: "Xcode_15.4" + runsOn: macOS-14 + name: "macOS 14, Xcode 15.4, Swift 5.10" - xcode: "Xcode_15.0" runsOn: macos-13 name: "macOS 13, Xcode 15.0, Swift 5.9.0" @@ -61,6 +67,18 @@ jobs: fail-fast: false matrix: include: + - destination: "OS=18.1,name=iPhone 16 Pro" + name: "iOS 18.1" + xcode: "Xcode_16.1" + runsOn: macOS-14 + - destination: "OS=18.0,name=iPhone 16 Pro" + name: "iOS 18.0" + xcode: "Xcode_16.0" + runsOn: macOS-14 + - destination: "OS=17.5,name=iPhone 15 Pro" + name: "iOS 17.5" + xcode: "Xcode_15.4" + runsOn: macOS-14 - destination: "OS=17.0.1,name=iPhone 14 Pro" name: "iOS 17.0.1" xcode: "Xcode_15.0" @@ -90,6 +108,18 @@ jobs: fail-fast: false matrix: include: + - destination: "OS=18.1,name=Apple TV" + name: "tvOS 18.1" + xcode: "Xcode_16.1" + runsOn: macOS-14 + - destination: "OS=18.0,name=Apple TV" + name: "tvOS 18.0" + xcode: "Xcode_16.0" + runsOn: macOS-14 + - destination: "OS=17.5,name=Apple TV" + name: "tvOS 17.5" + xcode: "Xcode_15.4" + runsOn: macOS-14 - destination: "OS=17.0,name=Apple TV" name: "tvOS 17.0" xcode: "Xcode_15.0" @@ -119,6 +149,18 @@ jobs: fail-fast: false matrix: include: + - destination: "OS=11.1,name=Apple Watch Series 10 (46mm)" + name: "watchOS 11.1" + xcode: "Xcode_16.1" + runsOn: macOS-14 + - destination: "OS=11.0,name=Apple Watch Series 10 (46mm)" + name: "watchOS 11.0" + xcode: "Xcode_16.0" + runsOn: macOS-14 + - destination: "OS=10.5,name=Apple Watch Series 9 (45mm)" + name: "watchOS 10.5" + xcode: "Xcode_15.4" + runsOn: macOS-14 - destination: "OS=10.0,name=Apple Watch Series 9 (45mm)" name: "watchOS 10.0" xcode: "Xcode_15.0" @@ -148,10 +190,16 @@ jobs: fail-fast: false matrix: include: - - name: "Xcode 15" + - name: "macOS 14, SPM 6.0.2 Test" + xcode: "Xcode_16.1" + runsOn: macOS-14 + - name: "macOS 14, SPM 6.0.0 Test" + xcode: "Xcode_16.0" + runsOn: macOS-14 + - name: "macOS 14, SPM 5.9.0 Test" xcode: "Xcode_15.0" - runsOn: macos-13 - - name: "Xcode 14" + runsOn: macos-14 + - name: "macOS 13, SPM 5.8.1 Test" xcode: "Xcode_14.3.1" runsOn: macos-13 steps: @@ -176,11 +224,11 @@ jobs: discover-typos: name: Discover Typos - runs-on: macOS-12 + runs-on: macOS-13 env: DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Discover typos run: | export PATH="$PATH:/Library/Frameworks/Python.framework/Versions/3.11/bin" diff --git a/.swiftlint.yml b/.swiftlint.yml index 208930e..63081f1 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -3,6 +3,8 @@ excluded: - Package.swift - Package@swift-5.7.swift - Package@swift-5.8.swift + - Package@swift-5.9.swift + - Package@swift-5.10.swift - .build # Rules @@ -132,4 +134,4 @@ nesting: type_name: max_length: warning: 40 - error: 50 \ No newline at end of file + error: 50 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aed454..b9641fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## [Unreleased] + +#### Added +- Increase the Swift version to 6.0. + - Added in Pull Request [#15](https://github.com/space-code/typhoon/pull/15) + #### 1.x Releases - `1.1.x` Releases - [1.1.0](#110) | [1.1.1](#111) - `1.0.x` Releases - [1.0.0](#100) @@ -11,7 +17,7 @@ All notable changes to this project will be documented in this file. - Add the `upload_test_coverage_report` action - Added in Pull Request [#11](https://github.com/space-code/typhoon/pull/11) - Add files to comply with community standards - - Added in Pull Request [#9](https://github.com/space-code/typhoon/pull/9). + - Added in Pull Request [#9](https://github.com/space-code/typhoon/pull/9) #### Updated - Update GitHub Actions diff --git a/Package.swift b/Package.swift index 44ca8ab..5127c68 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.9 +// swift-tools-version: 6.0 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription diff --git a/Package@swift-5.10.swift b/Package@swift-5.10.swift new file mode 100644 index 0000000..c6d2ebb --- /dev/null +++ b/Package@swift-5.10.swift @@ -0,0 +1,23 @@ +// swift-tools-version: 5.10 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Typhoon", + platforms: [ + .iOS(.v13), + .macOS(.v10_15), + .tvOS(.v13), + .watchOS(.v6), + .visionOS(.v1), + ], + products: [ + .library(name: "Typhoon", targets: ["Typhoon"]), + ], + dependencies: [], + targets: [ + .target(name: "Typhoon", dependencies: []), + .testTarget(name: "TyphoonTests", dependencies: ["Typhoon"]), + ] +) diff --git a/Package@swift-5.9.swift b/Package@swift-5.9.swift new file mode 100644 index 0000000..44ca8ab --- /dev/null +++ b/Package@swift-5.9.swift @@ -0,0 +1,23 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Typhoon", + platforms: [ + .iOS(.v13), + .macOS(.v10_15), + .tvOS(.v13), + .watchOS(.v6), + .visionOS(.v1), + ], + products: [ + .library(name: "Typhoon", targets: ["Typhoon"]), + ], + dependencies: [], + targets: [ + .target(name: "Typhoon", dependencies: []), + .testTarget(name: "TyphoonTests", dependencies: ["Typhoon"]), + ] +) From bd93207da584aa4480cdf61380aa19975a59998f Mon Sep 17 00:00:00 2001 From: Nikita Vasilev Date: Mon, 23 Dec 2024 08:41:50 +0100 Subject: [PATCH 2/2] Update `CHANGELOG.md` (#16) --- CHANGELOG.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9641fa..fac8da5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,17 @@ # Change Log All notable changes to this project will be documented in this file. -## [Unreleased] +#### 1.x Releases +- `1.2.x` Releases - [1.2.0](#120) +- `1.1.x` Releases - [1.1.0](#110) | [1.1.1](#111) +- `1.0.x` Releases - [1.0.0](#100) + +## [1.2.0](https://github.com/space-code/typhoon/releases/tag/1.2.0) #### Added - Increase the Swift version to 6.0. - Added in Pull Request [#15](https://github.com/space-code/typhoon/pull/15) -#### 1.x Releases -- `1.1.x` Releases - [1.1.0](#110) | [1.1.1](#111) -- `1.0.x` Releases - [1.0.0](#100) - ## [1.1.1](https://github.com/space-code/typhoon/releases/tag/1.1.1) #### Added