Skip to content

Commit 017e04b

Browse files
authored
Upgrades Xcode version to 16 in CI (#275)
1 parent 4e5a1f6 commit 017e04b

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

.github/workflows/main.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
jobs:
1919
test:
2020
name: Test on ${{ matrix.platform.os }} using Xcode ${{ matrix.xcode }}
21-
runs-on: macos-13
21+
runs-on: macos-14
2222

2323
env:
2424
xcodeproj: JWTDecode.xcodeproj
@@ -30,7 +30,7 @@ jobs:
3030
- { os: macOS, scheme: JWTDecode-macOS }
3131
- { os: tvOS, scheme: JWTDecode-tvOS }
3232
xcode:
33-
- '15.0.1'
33+
- '16.1'
3434

3535
steps:
3636
- name: Checkout
@@ -61,12 +61,12 @@ jobs:
6161

6262
test-package:
6363
name: Test Swift package using Xcode ${{ matrix.xcode }}
64-
runs-on: macos-13
64+
runs-on: macos-14
6565

6666
strategy:
6767
matrix:
6868
xcode:
69-
- '15.0.1'
69+
- '16.1'
7070

7171
steps:
7272
- name: Checkout
@@ -83,12 +83,12 @@ jobs:
8383

8484
pod-lint:
8585
name: Lint podspec using Xcode ${{ matrix.xcode }}
86-
runs-on: macos-13-xlarge
86+
runs-on: macos-14-xlarge
8787

8888
strategy:
8989
matrix:
9090
xcode:
91-
- '15.2'
91+
- '16.1'
9292

9393
steps:
9494
- name: Checkout
@@ -105,11 +105,14 @@ jobs:
105105

106106
swiftlint:
107107
name: Lint code with SwiftLint
108-
runs-on: macos-13
108+
runs-on: macos-14
109109

110110
steps:
111111
- name: Checkout
112112
uses: actions/checkout@v4
113113

114+
- name: Install SwiftLint
115+
run: brew install swiftlint
116+
114117
- name: Run SwiftLint
115118
run: swiftlint lint --reporter github-actions-logging

JWTDecode.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
1919
s.visionos.deployment_target = '1.0'
2020

2121
s.source_files = 'JWTDecode/*.swift'
22-
s.swift_versions = ['5.9']
22+
s.swift_versions = ['6.0', '6.1']
2323
end

JWTDecodeTests/JWTDecodeSpec.swift

-4
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,7 @@ class JWTDecodeSpec: XCTestCase {
410410
}
411411
}
412412

413-
#if compiler(>=6.0)
414413
extension JWTDecodeError: @retroactive Equatable {}
415-
#else
416-
extension JWTDecodeError: Equatable {}
417-
#endif
418414

419415
public func ==(lhs: JWTDecodeError, rhs: JWTDecodeError) -> Bool {
420416
return lhs.localizedDescription == rhs.localizedDescription && lhs.errorDescription == rhs.errorDescription

Package.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.9
1+
// swift-tools-version:6.0
22

33
import PackageDescription
44

@@ -24,5 +24,6 @@ let package = Package(
2424
.product(name: "Nimble", package: "Nimble"),
2525
],
2626
path: "JWTDecodeTests",
27-
exclude: ["Info.plist"])
27+
exclude: ["Info.plist"],
28+
swiftSettings: [.swiftLanguageMode(.v5)])
2829
])

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Migrating from v2? Check the [Migration Guide](V3_MIGRATION_GUIDE.md).
2727
### Requirements
2828

2929
- iOS 14.0+ / macOS 11.0+ / tvOS 14.0+ / watchOS 7.0+
30-
- Xcode 15.x
31-
- Swift 5.9+
30+
- Xcode 16.x
31+
- Swift 6.0+
3232

3333
### Installation
3434

0 commit comments

Comments
 (0)