Add support for Swift 6.2 (#19)

ns-vasilev · web-flow · commit 381834cf5b85 · 2025-11-14T10:25:19.000+04:00
Release `1.2.0`
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,26 +34,23 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - xcode: "Xcode_16.0"
+          - xcode: "Xcode_26.0.1"
+            runsOn: macOS-26
+            name: "macOS 26, Xcode 26.0, Swift 6.2.0"
+          - xcode: "Xcode_16.1"
             runsOn: macOS-14
-            name: "macOS 14, Xcode 16.0, Swift 6.0"
+            name: "macOS 14, Xcode 16.1, Swift 6.0.2"
           - 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"
-          - xcode: "Xcode_14.3.1"
-            runsOn: macos-13
-            name: "macOS 13, Xcode 14.3.1, Swift 5.8.0"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
         run: xcodebuild test -scheme "Validator-Package" -destination "platform=macOS" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload test coverage reports to Codecov
         uses: space-code/oss-common-actions/.github/actions/upload_test_coverage_report@main
         with:
-          scheme_name: Typhoon
+          scheme_name: Validator-Package
           filename: ${{ matrix.name }}
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -67,28 +64,20 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=26.0.1,name=iPhone 17 Pro"
+            xcode: "Xcode_26.0.1"
+            runsOn: macOS-26
+            name: "OS=26.0, Xcode 26.0, Swift 6.2.0"
           - 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"
-            runsOn: macos-13
-          - destination: "OS=16.4,name=iPhone 14 Pro"
-            name: "iOS 16.4"
-            xcode: "Xcode_14.3.1"
-            runsOn: macos-13
+          - destination: "OS=17.4,name=iPhone 15 Pro"
+            name: "iOS 17.4"
+            xcode: "Xcode_15.3"
+            runsOn: macos-14
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
         run: xcodebuild test -scheme "Validator-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - uses: actions/upload-artifact@v4
@@ -106,28 +95,20 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=26.0,name=Apple TV"
+            xcode: "Xcode_26.0.1"
+            runsOn: macOS-26
+            name: "tvOS 26.0"
           - 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"
-            runsOn: macos-13
-          - destination: "OS=16.4,name=Apple TV"
-            name: "tvOS 16.4"
-            xcode: "Xcode_14.3.1"
-            runsOn: macos-13
+          - destination: "OS=17.4,name=Apple TV"
+            name: "tvOS 17.4"
+            xcode: "Xcode_15.3"
+            runsOn: macos-14
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
         run: xcodebuild test -scheme "Validator-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload test coverage reports to Codecov
@@ -147,34 +128,30 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "OS=26.0,name=Apple Watch Ultra 3 (49mm)"
+            xcode: "Xcode_26.0.1"
+            runsOn: macOS-26
+            name: "watchOS 26.0"
           - 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"
+            xcode: "Xcode_15.3"
             runsOn: macOS-14
-          - destination: "OS=10.0,name=Apple Watch Series 9 (45mm)"
-            name: "watchOS 10.0"
-            xcode: "Xcode_15.0"
-            runsOn: macos-13
-          - destination: "OS=9.4,name=Apple Watch Series 8 (45mm)"
-            name: "watchOS 9.4"
-            xcode: "Xcode_14.3.1"
-            runsOn: macos-13
+          - destination: "OS=10.4,name=Apple Watch Series 9 (45mm)"
+            name: "watchOS 10.4"
+            xcode: "Xcode_15.3"
+            runsOn: macos-14
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
         run: xcodebuild test -scheme "Validator-Package" -destination "${{ matrix.destination }}" clean -enableCodeCoverage YES -resultBundlePath "test_output/${{ matrix.name }}.xcresult" || exit 1
       - name: Upload test coverage reports to Codecov
         uses: space-code/oss-common-actions/.github/actions/upload_test_coverage_report@main
         with:
-          scheme_name: Typhoon
+          scheme_name: Validator-Package
           filename: ${{ matrix.name }}
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -188,48 +165,54 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - destination: "macOS 26, SPM 6.2.0 Test"
+            xcode: "Xcode_26.0.1"
+            runsOn: macOS-26
+          - destination: "macOS 15, SPM 6.0.2 Test"
+            xcode: "Xcode_16.0"
+            runsOn: macOS-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"
+          - name: "macOS 14, SPM 5.10.0 Test"
+            xcode: "Xcode_15.3"
             runsOn: macos-14
-          - name: "macOS 13, SPM 5.8.1 Test"
-            xcode: "Xcode_14.3.1"
-            runsOn: macos-13
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: ${{ matrix.name }}
         run: swift build -c release
 
   merge-test-reports:
     needs: [iOS, macOS, watchOS, tvOS]
-    runs-on: macos-13
+    runs-on: macos-15
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           path: test_output
       - run: xcrun xcresulttool merge test_output/**/*.xcresult --output-path test_output/final/final.xcresult
       - name: Upload Merged Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: MergedResult
           path: test_output/final
 
   discover-typos:
     name: Discover Typos
-    runs-on: macOS-13
+    runs-on: macos-15
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
+
+      - name: Set up Python environment
+        run: |
+          python3 -m venv .venv
+          source .venv/bin/activate
+          pip install --upgrade pip
+          pip install codespell
+
       - name: Discover typos
         run: |
-          export PATH="$PATH:/Library/Frameworks/Python.framework/Versions/3.11/bin"
-          python3 -m pip install --upgrade pip
-          python3 -m pip install codespell
-          codespell --ignore-words-list="hart,inout,msdos,sur" --skip="./.build/*,./.git/*"
+          source .venv/bin/activate
+          codespell --ignore-words-list="hart,inout,msdos,sur" --skip="./.build/*,./.git/*"
diff --git a/.swiftformat b/.swiftformat
@@ -1,6 +1,6 @@
 # Stream rules
 
---swiftversion 5.7
+--swiftversion 6.2
 
 # Use 'swiftformat --options' to list all of the possible options
 
@@ -36,8 +36,8 @@
 --enable redundantSelf
 --enable redundantVoidReturnType
 --enable semicolons
---enable sortedImports
---enable sortedSwitchCases
+--enable sortImports
+--enable sortSwitchCases
 --enable spaceAroundBraces
 --enable spaceAroundBrackets
 --enable spaceAroundComments
@@ -61,4 +61,4 @@
 
 --wraparguments before-first
 --wrapcollections before-first
---maxwidth 140
+--maxwidth 140
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,10 +1,9 @@
 excluded:
   - Tests
   - Package.swift
-  - Package@swift-5.7.swift
-  - Package@swift-5.8.swift
-  - Package@swift-5.9.swift
   - Package@swift-5.10.swift
+  - Package@swift-6.0.swift
+  - Package@swift-6.1.swift
   - .build
 
 # Rules
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,22 @@
 All notable changes to this project will be documented in this file.
 
 #### 1.x Releases
+- `1.2.x` Releases - [1.2.0](#120)
 - `1.1.x` Releases - [1.1.0](#110)
 - `1.0.x` Releases - [1.0.0](#100) | [1.0.1](#101)
 
+## [1.1.0](https://github.com/space-code/validator/releases/tag/1.2.0)
+Released on 2025-11-13.
+
+#### Updated
+- Update the Swift version to 6.2.
+  - Added in Pull Request [#18](https://github.com/space-code/validator/pull/18).
+
 ## [1.1.0](https://github.com/space-code/validator/releases/tag/1.1.0)
 Released on 2024-12-24.
 
 #### Added
-- Increase the Swift version to 6.0.
+- Add support for the Swift version to 6.0.
   - Added in Pull Request [#13](https://github.com/space-code/validator/pull/13).
 
 #### Updated
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -16,7 +16,6 @@ let package = Package(
         .library(name: "ValidatorCore", targets: ["ValidatorCore"]),
         .library(name: "ValidatorUI", targets: ["ValidatorUI"]),
     ],
-    dependencies: [],
     targets: [
         .target(name: "ValidatorCore", dependencies: []),
         .target(name: "ValidatorUI", dependencies: ["ValidatorCore"]),
diff --git a/Package@swift-5.10.swift b/Package@swift-5.10.swift
@@ -16,7 +16,6 @@ let package = Package(
         .library(name: "ValidatorCore", targets: ["ValidatorCore"]),
         .library(name: "ValidatorUI", targets: ["ValidatorUI"]),
     ],
-    dependencies: [],
     targets: [
         .target(name: "ValidatorCore", dependencies: []),
         .target(name: "ValidatorUI", dependencies: ["ValidatorCore"]),
diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift
diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.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
@@ -16,7 +16,6 @@ let package = Package(
         .library(name: "ValidatorCore", targets: ["ValidatorCore"]),
         .library(name: "ValidatorUI", targets: ["ValidatorUI"]),
     ],
-    dependencies: [],
     targets: [
         .target(name: "ValidatorCore", dependencies: []),
         .target(name: "ValidatorUI", dependencies: ["ValidatorCore"]),
diff --git a/Package@swift-6.1.swift b/Package@swift-6.1.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -10,12 +10,12 @@ let package = Package(
         .macOS(.v13),
         .watchOS(.v9),
         .tvOS(.v16),
+        .visionOS(.v1),
     ],
     products: [
         .library(name: "ValidatorCore", targets: ["ValidatorCore"]),
         .library(name: "ValidatorUI", targets: ["ValidatorUI"]),
     ],
-    dependencies: [],
     targets: [
         .target(name: "ValidatorCore", dependencies: []),
         .target(name: "ValidatorUI", dependencies: ["ValidatorCore"]),
diff --git a/README.md b/README.md
diff --git a/Sources/ValidatorUI/Classes/IUIValidatable.swift b/Sources/ValidatorUI/Classes/IUIValidatable.swift
diff --git a/Sources/ValidatorUI/Classes/SUI/Extensions/View+Validation.swift b/Sources/ValidatorUI/Classes/SUI/Extensions/View+Validation.swift

-Original file line number
+Diff line change
@@ @@ -1,10 +1,9 @@ @@
 excluded:
   - Tests
   - Package.swift
 -  - [email protected]
 -  - [email protected]
 -  - [email protected]
   - [email protected]
 +  - [email protected]
 +  - [email protected]
   - .build
 # Rules