Skip to content

Commit 64f8473

Browse files
committed
SDK-5914 Updated xcode 16 and macos version for CI
1 parent 7a0a163 commit 64f8473

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 7 deletions
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.xcodeproj/project.pbxproj

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,18 @@
2525
918A8E651D63D2F7001F787B /* JWTDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F0069021B3B511F0048928E /* JWTDecode.swift */; };
2626
918A8E661D63D2FB001F787B /* JWT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FE49DCC1BA0D5F700DE57D3 /* JWT.swift */; };
2727
918A8E671D63D2FE001F787B /* JWTDecodeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FE49DCF1BA0D66F00DE57D3 /* JWTDecodeError.swift */; };
28-
C12BFE422C348AF500D1CC00 /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C12BFE412C348AF500D1CC00 /* CwlPreconditionTesting */; };
2928
C1896EF92C1C69F400CA1000 /* JWTDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F0069021B3B511F0048928E /* JWTDecode.swift */; };
3029
C1896EFA2C1C69F400CA1000 /* JWTDecodeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FE49DCF1BA0D66F00DE57D3 /* JWTDecodeError.swift */; };
3130
C1896EFB2C1C69F400CA1000 /* JWT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FE49DCC1BA0D5F700DE57D3 /* JWT.swift */; };
3231
C1896F042C1C71AC00CA1000 /* JWTDecode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C1896EF12C1C690E00CA1000 /* JWTDecode.framework */; };
33-
C1896F0C2C1C730F00CA1000 /* Nimble.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE9C9F926FC1E8F005A75FA /* Nimble.xcframework */; };
34-
C1896F0D2C1C730F00CA1000 /* Nimble.xcframework in Copy Files */ = {isa = PBXBuildFile; fileRef = 5CE9C9F926FC1E8F005A75FA /* Nimble.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
35-
C1896F0F2C1C731000CA1000 /* Quick.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE9C9FA26FC1E8F005A75FA /* Quick.xcframework */; };
36-
C1896F102C1C731100CA1000 /* Quick.xcframework in Copy Files */ = {isa = PBXBuildFile; fileRef = 5CE9C9FA26FC1E8F005A75FA /* Quick.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
32+
C1896F0C2C1C730F00CA1000 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
33+
C1896F0F2C1C731000CA1000 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
3734
C1896F112C1C738900CA1000 /* JWTDecodeSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57EA5A02237EBBCA00264C01 /* JWTDecodeSpec.swift */; };
3835
C1896F122C1C738900CA1000 /* JWTHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57EA5A04237EBBCB00264C01 /* JWTHelper.swift */; };
3936
C1D1FB862C2177DA008E9E3F /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FB852C2177DA008E9E3F /* CwlPreconditionTesting */; };
40-
C1D1FB882C217FBF008E9E3F /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FB872C217FBF008E9E3F /* CwlPreconditionTesting */; };
41-
C1D1FB8A2C218877008E9E3F /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FB892C218877008E9E3F /* CwlPreconditionTesting */; };
37+
D47FD4E72DB6486B005FB4C4 /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FB872C217FBF008E9E3F /* CwlPreconditionTesting */; };
38+
D47FD4E82DB6486B005FB4C4 /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C1D1FB892C218877008E9E3F /* CwlPreconditionTesting */; };
39+
D47FD4E92DB6486B005FB4C4 /* CwlPreconditionTesting in Frameworks */ = {isa = PBXBuildFile; productRef = C12BFE412C348AF500D1CC00 /* CwlPreconditionTesting */; };
4240
E390BAD32288E6AF00780D6C /* JWTDecodeError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FE49DCF1BA0D66F00DE57D3 /* JWTDecodeError.swift */; };
4341
E390BAD82288E6AF00780D6C /* JWTDecode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F0069021B3B511F0048928E /* JWTDecode.swift */; };
4442
E390BAD92288E6AF00780D6C /* JWT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FE49DCC1BA0D5F700DE57D3 /* JWT.swift */; };
@@ -116,6 +114,7 @@
116114
isa = PBXFrameworksBuildPhase;
117115
buildActionMask = 2147483647;
118116
files = (
117+
D47FD4E72DB6486B005FB4C4 /* CwlPreconditionTesting in Frameworks */,
119118
5CE9CA0C26FC22F8005A75FA /* JWTDecode.framework in Frameworks */,
120119
);
121120
runOnlyForDeploymentPostprocessing = 0;
@@ -131,6 +130,7 @@
131130
isa = PBXFrameworksBuildPhase;
132131
buildActionMask = 2147483647;
133132
files = (
133+
D47FD4E82DB6486B005FB4C4 /* CwlPreconditionTesting in Frameworks */,
134134
5CE9CA0D26FC23B1005A75FA /* JWTDecode.framework in Frameworks */,
135135
);
136136
runOnlyForDeploymentPostprocessing = 0;
@@ -146,6 +146,7 @@
146146
isa = PBXFrameworksBuildPhase;
147147
buildActionMask = 2147483647;
148148
files = (
149+
D47FD4E92DB6486B005FB4C4 /* CwlPreconditionTesting in Frameworks */,
149150
5CE9CA0E26FC23B8005A75FA /* JWTDecode.framework in Frameworks */,
150151
);
151152
runOnlyForDeploymentPostprocessing = 0;
@@ -162,8 +163,8 @@
162163
buildActionMask = 2147483647;
163164
files = (
164165
C1D1FB862C2177DA008E9E3F /* CwlPreconditionTesting in Frameworks */,
165-
C1896F0F2C1C731000CA1000 /* Quick.xcframework in Frameworks */,
166-
C1896F0C2C1C730F00CA1000 /* Nimble.xcframework in Frameworks */,
166+
C1896F0F2C1C731000CA1000 /* (null) in Frameworks */,
167+
C1896F0C2C1C730F00CA1000 /* (null) in Frameworks */,
167168
C1896F042C1C71AC00CA1000 /* JWTDecode.framework in Frameworks */,
168169
);
169170
runOnlyForDeploymentPostprocessing = 0;
@@ -445,7 +446,6 @@
445446
C1896EFC2C1C71AC00CA1000 /* Sources */,
446447
C1896EFD2C1C71AC00CA1000 /* Frameworks */,
447448
C1896EFE2C1C71AC00CA1000 /* Resources */,
448-
C1896F0E2C1C730F00CA1000 /* Copy Files */,
449449
);
450450
buildRules = (
451451
);
@@ -930,6 +930,7 @@
930930
isa = XCBuildConfiguration;
931931
buildSettings = {
932932
APPLICATION_EXTENSION_API_ONLY = YES;
933+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
933934
CLANG_ENABLE_CODE_COVERAGE = YES;
934935
CLANG_ENABLE_MODULES = YES;
935936
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -959,6 +960,7 @@
959960
isa = XCBuildConfiguration;
960961
buildSettings = {
961962
APPLICATION_EXTENSION_API_ONLY = YES;
963+
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
962964
CLANG_ENABLE_CODE_COVERAGE = YES;
963965
CLANG_ENABLE_MODULES = YES;
964966
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";

0 commit comments

Comments
 (0)