Skip to content

Commit 17fe119

Browse files
kylefkylef
committed
Support Swift 3.0
1 parent 65ab050 commit 17fe119

File tree

8 files changed

+176
-258
lines changed

8 files changed

+176
-258
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode7.3
2+
osx_image: xcode8
33
script:
44
- set -o pipefail
55
- git submodule update --init --recursive

‎JWT.xcodeproj/project.pbxproj

Lines changed: 11 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
2734C6A81D88001F00BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
11+
2734C6A91D88002900BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
12+
2734C6AA1D88003000BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
1013
279D63A21AD07FFF0024E2BC /* JWT.h in Headers */ = {isa = PBXBuildFile; fileRef = 279D63A11AD07FFF0024E2BC /* JWT.h */; settings = {ATTRIBUTES = (Public, ); }; };
1114
279D63A81AD07FFF0024E2BC /* JWT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 279D639C1AD07FFF0024E2BC /* JWT.framework */; };
1215
279D63AF1AD07FFF0024E2BC /* JWTTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279D63AE1AD07FFF0024E2BC /* JWTTests.swift */; };
1316
520A71171C469F010005C709 /* Base64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71131C469F010005C709 /* Base64.swift */; };
1417
520A71181C469F010005C709 /* Claims.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71141C469F010005C709 /* Claims.swift */; };
1518
520A71191C469F010005C709 /* Decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71151C469F010005C709 /* Decode.swift */; };
1619
520A711A1C469F010005C709 /* JWT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71161C469F010005C709 /* JWT.swift */; };
17-
66725DB61C59208400FC32F4 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DB11C59202E00FC32F4 /* CryptoSwift.framework */; };
1820
CD9B62171C7753D8005D4844 /* Claims.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71141C469F010005C709 /* Claims.swift */; };
1921
CD9B62181C7753D8005D4844 /* JWT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71161C469F010005C709 /* JWT.swift */; };
2022
CD9B62191C7753D8005D4844 /* Decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71151C469F010005C709 /* Decode.swift */; };
@@ -31,8 +33,6 @@
3133
CD9B623E1C7753FB005D4844 /* Base64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71131C469F010005C709 /* Base64.swift */; };
3234
CD9B62421C7753FB005D4844 /* JWT.h in Headers */ = {isa = PBXBuildFile; fileRef = 279D63A11AD07FFF0024E2BC /* JWT.h */; settings = {ATTRIBUTES = (Public, ); }; };
3335
CD9B62891C7758BB005D4844 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
34-
CD9B628E1C7758E5005D4844 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAF1C59202E00FC32F4 /* CryptoSwift.framework */; };
35-
CD9B62911C775900005D4844 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAD1C59202E00FC32F4 /* CryptoSwift.framework */; };
3636
/* End PBXBuildFile section */
3737

3838
/* Begin PBXContainerItemProxy section */
@@ -50,62 +50,20 @@
5050
remoteGlobalIDString = 754BE45519693E190098E6F3;
5151
remoteInfo = "CryptoSwift iOS";
5252
};
53-
66725DAC1C59202E00FC32F4 /* PBXContainerItemProxy */ = {
54-
isa = PBXContainerItemProxy;
55-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
56-
proxyType = 2;
57-
remoteGlobalIDString = 5596BDBB1BC8F220007E38D5;
58-
remoteInfo = "CryptoSwift watchOS";
59-
};
60-
66725DAE1C59202E00FC32F4 /* PBXContainerItemProxy */ = {
61-
isa = PBXContainerItemProxy;
62-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
63-
proxyType = 2;
64-
remoteGlobalIDString = 75D614BF1BD844F2001358B2;
65-
remoteInfo = "CryptoSwift tvOS";
66-
};
67-
66725DB01C59202E00FC32F4 /* PBXContainerItemProxy */ = {
68-
isa = PBXContainerItemProxy;
69-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
70-
proxyType = 2;
71-
remoteGlobalIDString = 75DF77721BC8EB59006E9520;
72-
remoteInfo = "CryptoSwift OSX";
73-
};
7453
66725DB21C59202E00FC32F4 /* PBXContainerItemProxy */ = {
7554
isa = PBXContainerItemProxy;
7655
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
7756
proxyType = 2;
7857
remoteGlobalIDString = 754BE46019693E190098E6F3;
7958
remoteInfo = CryptoSwiftTests;
8059
};
81-
66725DB41C59203B00FC32F4 /* PBXContainerItemProxy */ = {
82-
isa = PBXContainerItemProxy;
83-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
84-
proxyType = 1;
85-
remoteGlobalIDString = 75DF77461BC8EB59006E9520;
86-
remoteInfo = "CryptoSwift OSX";
87-
};
8860
CD9B628A1C7758CA005D4844 /* PBXContainerItemProxy */ = {
8961
isa = PBXContainerItemProxy;
9062
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
9163
proxyType = 1;
9264
remoteGlobalIDString = 754BE45419693E190098E6F3;
9365
remoteInfo = "CryptoSwift iOS";
9466
};
95-
CD9B628C1C7758DA005D4844 /* PBXContainerItemProxy */ = {
96-
isa = PBXContainerItemProxy;
97-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
98-
proxyType = 1;
99-
remoteGlobalIDString = 75D614921BD844F2001358B2;
100-
remoteInfo = "CryptoSwift tvOS";
101-
};
102-
CD9B628F1C7758FB005D4844 /* PBXContainerItemProxy */ = {
103-
isa = PBXContainerItemProxy;
104-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
105-
proxyType = 1;
106-
remoteGlobalIDString = 5596BDBA1BC8F220007E38D5;
107-
remoteInfo = "CryptoSwift watchOS";
108-
};
10967
/* End PBXContainerItemProxy section */
11068

11169
/* Begin PBXFileReference section */
@@ -133,7 +91,7 @@
13391
isa = PBXFrameworksBuildPhase;
13492
buildActionMask = 2147483647;
13593
files = (
136-
66725DB61C59208400FC32F4 /* CryptoSwift.framework in Frameworks */,
94+
2734C6A81D88001F00BFF9F1 /* CryptoSwift.framework in Frameworks */,
13795
);
13896
runOnlyForDeploymentPostprocessing = 0;
13997
};
@@ -157,15 +115,15 @@
157115
isa = PBXFrameworksBuildPhase;
158116
buildActionMask = 2147483647;
159117
files = (
160-
CD9B628E1C7758E5005D4844 /* CryptoSwift.framework in Frameworks */,
118+
2734C6A91D88002900BFF9F1 /* CryptoSwift.framework in Frameworks */,
161119
);
162120
runOnlyForDeploymentPostprocessing = 0;
163121
};
164122
CD9B623F1C7753FB005D4844 /* Frameworks */ = {
165123
isa = PBXFrameworksBuildPhase;
166124
buildActionMask = 2147483647;
167125
files = (
168-
CD9B62911C775900005D4844 /* CryptoSwift.framework in Frameworks */,
126+
2734C6AA1D88003000BFF9F1 /* CryptoSwift.framework in Frameworks */,
169127
);
170128
runOnlyForDeploymentPostprocessing = 0;
171129
};
@@ -248,10 +206,7 @@
248206
isa = PBXGroup;
249207
children = (
250208
66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */,
251-
66725DAD1C59202E00FC32F4 /* CryptoSwift.framework */,
252-
66725DB11C59202E00FC32F4 /* CryptoSwift.framework */,
253-
66725DAF1C59202E00FC32F4 /* CryptoSwift.framework */,
254-
66725DB31C59202E00FC32F4 /* CryptoSwiftTests.xctest */,
209+
66725DB31C59202E00FC32F4 /* Tests.xctest */,
255210
);
256211
name = Products;
257212
sourceTree = "<group>";
@@ -315,7 +270,6 @@
315270
buildRules = (
316271
);
317272
dependencies = (
318-
66725DB51C59203B00FC32F4 /* PBXTargetDependency */,
319273
);
320274
name = "JWT-OSX";
321275
productName = JWT;
@@ -371,7 +325,6 @@
371325
buildRules = (
372326
);
373327
dependencies = (
374-
CD9B628D1C7758DA005D4844 /* PBXTargetDependency */,
375328
);
376329
name = "JWT-tvOS";
377330
productName = JWT;
@@ -390,7 +343,6 @@
390343
buildRules = (
391344
);
392345
dependencies = (
393-
CD9B62901C7758FB005D4844 /* PBXTargetDependency */,
394346
);
395347
name = "JWT-watchOS";
396348
productName = JWT;
@@ -451,31 +403,10 @@
451403
remoteRef = 66725DAA1C59202E00FC32F4 /* PBXContainerItemProxy */;
452404
sourceTree = BUILT_PRODUCTS_DIR;
453405
};
454-
66725DAD1C59202E00FC32F4 /* CryptoSwift.framework */ = {
455-
isa = PBXReferenceProxy;
456-
fileType = wrapper.framework;
457-
path = CryptoSwift.framework;
458-
remoteRef = 66725DAC1C59202E00FC32F4 /* PBXContainerItemProxy */;
459-
sourceTree = BUILT_PRODUCTS_DIR;
460-
};
461-
66725DAF1C59202E00FC32F4 /* CryptoSwift.framework */ = {
462-
isa = PBXReferenceProxy;
463-
fileType = wrapper.framework;
464-
path = CryptoSwift.framework;
465-
remoteRef = 66725DAE1C59202E00FC32F4 /* PBXContainerItemProxy */;
466-
sourceTree = BUILT_PRODUCTS_DIR;
467-
};
468-
66725DB11C59202E00FC32F4 /* CryptoSwift.framework */ = {
469-
isa = PBXReferenceProxy;
470-
fileType = wrapper.framework;
471-
path = CryptoSwift.framework;
472-
remoteRef = 66725DB01C59202E00FC32F4 /* PBXContainerItemProxy */;
473-
sourceTree = BUILT_PRODUCTS_DIR;
474-
};
475-
66725DB31C59202E00FC32F4 /* CryptoSwiftTests.xctest */ = {
406+
66725DB31C59202E00FC32F4 /* Tests.xctest */ = {
476407
isa = PBXReferenceProxy;
477408
fileType = wrapper.cfbundle;
478-
path = CryptoSwiftTests.xctest;
409+
path = Tests.xctest;
479410
remoteRef = 66725DB21C59202E00FC32F4 /* PBXContainerItemProxy */;
480411
sourceTree = BUILT_PRODUCTS_DIR;
481412
};
@@ -580,26 +511,11 @@
580511
target = 279D639B1AD07FFF0024E2BC /* JWT-OSX */;
581512
targetProxy = 279D63A91AD07FFF0024E2BC /* PBXContainerItemProxy */;
582513
};
583-
66725DB51C59203B00FC32F4 /* PBXTargetDependency */ = {
584-
isa = PBXTargetDependency;
585-
name = "CryptoSwift OSX";
586-
targetProxy = 66725DB41C59203B00FC32F4 /* PBXContainerItemProxy */;
587-
};
588514
CD9B628B1C7758CA005D4844 /* PBXTargetDependency */ = {
589515
isa = PBXTargetDependency;
590516
name = "CryptoSwift iOS";
591517
targetProxy = CD9B628A1C7758CA005D4844 /* PBXContainerItemProxy */;
592518
};
593-
CD9B628D1C7758DA005D4844 /* PBXTargetDependency */ = {
594-
isa = PBXTargetDependency;
595-
name = "CryptoSwift tvOS";
596-
targetProxy = CD9B628C1C7758DA005D4844 /* PBXContainerItemProxy */;
597-
};
598-
CD9B62901C7758FB005D4844 /* PBXTargetDependency */ = {
599-
isa = PBXTargetDependency;
600-
name = "CryptoSwift watchOS";
601-
targetProxy = CD9B628F1C7758FB005D4844 /* PBXContainerItemProxy */;
602-
};
603519
/* End PBXTargetDependency section */
604520

605521
/* Begin XCBuildConfiguration section */
@@ -644,6 +560,7 @@
644560
PRODUCT_NAME = "$(PROJECT_NAME)";
645561
SDKROOT = macosx;
646562
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
563+
SWIFT_VERSION = 3.0;
647564
VERSIONING_SYSTEM = "apple-generic";
648565
VERSION_INFO_PREFIX = "";
649566
};
@@ -682,6 +599,7 @@
682599
MTL_ENABLE_DEBUG_INFO = NO;
683600
PRODUCT_NAME = "$(PROJECT_NAME)";
684601
SDKROOT = macosx;
602+
SWIFT_VERSION = 3.0;
685603
VERSIONING_SYSTEM = "apple-generic";
686604
VERSION_INFO_PREFIX = "";
687605
};

0 commit comments

Comments
 (0)