diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c023b2..b4251de 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ env: jobs: test: name: Test on ${{ matrix.platform.os }} using Xcode ${{ matrix.xcode }} - runs-on: macos-13 + runs-on: macos-14 env: xcodeproj: JWTDecode.xcodeproj @@ -30,7 +30,7 @@ jobs: - { os: macOS, scheme: JWTDecode-macOS } - { os: tvOS, scheme: JWTDecode-tvOS } xcode: - - '15.0.1' + - '16.1' steps: - name: Checkout @@ -61,12 +61,12 @@ jobs: test-package: name: Test Swift package using Xcode ${{ matrix.xcode }} - runs-on: macos-13 + runs-on: macos-14 strategy: matrix: xcode: - - '15.0.1' + - '16.1' steps: - name: Checkout @@ -83,12 +83,12 @@ jobs: pod-lint: name: Lint podspec using Xcode ${{ matrix.xcode }} - runs-on: macos-13-xlarge + runs-on: macos-14-xlarge strategy: matrix: xcode: - - '15.2' + - '16.1' steps: - name: Checkout @@ -105,11 +105,14 @@ jobs: swiftlint: name: Lint code with SwiftLint - runs-on: macos-13 + runs-on: macos-14 steps: - name: Checkout uses: actions/checkout@v4 + - name: Install SwiftLint + run: brew install swiftlint + - name: Run SwiftLint run: swiftlint lint --reporter github-actions-logging diff --git a/JWTDecode.podspec b/JWTDecode.podspec index 52620ce..b7230fd 100644 --- a/JWTDecode.podspec +++ b/JWTDecode.podspec @@ -19,5 +19,5 @@ Pod::Spec.new do |s| s.visionos.deployment_target = '1.0' s.source_files = 'JWTDecode/*.swift' - s.swift_versions = ['5.9'] + s.swift_versions = ['6.0', '6.1'] end diff --git a/JWTDecodeTests/JWTDecodeSpec.swift b/JWTDecodeTests/JWTDecodeSpec.swift index 7642304..c9bcde4 100644 --- a/JWTDecodeTests/JWTDecodeSpec.swift +++ b/JWTDecodeTests/JWTDecodeSpec.swift @@ -410,11 +410,7 @@ class JWTDecodeSpec: XCTestCase { } } -#if compiler(>=6.0) extension JWTDecodeError: @retroactive Equatable {} -#else -extension JWTDecodeError: Equatable {} -#endif public func ==(lhs: JWTDecodeError, rhs: JWTDecodeError) -> Bool { return lhs.localizedDescription == rhs.localizedDescription && lhs.errorDescription == rhs.errorDescription diff --git a/Package.swift b/Package.swift index d2d68a0..fed6ebb 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.9 +// swift-tools-version:6.0 import PackageDescription @@ -24,5 +24,6 @@ let package = Package( .product(name: "Nimble", package: "Nimble"), ], path: "JWTDecodeTests", - exclude: ["Info.plist"]) + exclude: ["Info.plist"], + swiftSettings: [.swiftLanguageMode(.v5)]) ]) diff --git a/README.md b/README.md index 369e41b..ec2d987 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ Migrating from v2? Check the [Migration Guide](V3_MIGRATION_GUIDE.md). ### Requirements - iOS 14.0+ / macOS 11.0+ / tvOS 14.0+ / watchOS 7.0+ -- Xcode 15.x -- Swift 5.9+ +- Xcode 16.x +- Swift 6.0+ ### Installation