Skip to content

Commit c5e4b5d

Browse files
kylefkylef
authored
Merge pull request #78 from kylef/kylef/carthage-cc
Use CommonCrypto in Xcode
2 parents 4e49b0a + 9b7463f commit c5e4b5d

File tree

5 files changed

+10
-83
lines changed

5 files changed

+10
-83
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Cartfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Cartfile.resolved

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Carthage/Checkouts/CryptoSwift

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎JWT.xcodeproj/project.pbxproj

Lines changed: 10 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,10 @@
1111
273011001F33EABA00219C35 /* HMAC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273010FE1F33EABA00219C35 /* HMAC.swift */; };
1212
273011011F33EABA00219C35 /* HMAC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273010FE1F33EABA00219C35 /* HMAC.swift */; };
1313
273011021F33EABA00219C35 /* HMAC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273010FE1F33EABA00219C35 /* HMAC.swift */; };
14-
2730110A1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
15-
2730110B1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
16-
2730110C1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
17-
2730110D1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
18-
2734C6A81D88001F00BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
19-
2734C6A91D88002900BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
20-
2734C6AA1D88003000BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
14+
273011161F34029900219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
15+
273011171F34029900219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
16+
273011181F34029A00219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
17+
273011191F34029A00219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
2118
277794051DF221F800573F3E /* ClaimSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277794041DF221F800573F3E /* ClaimSet.swift */; };
2219
277794061DF221F800573F3E /* ClaimSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277794041DF221F800573F3E /* ClaimSet.swift */; };
2320
277794071DF221F800573F3E /* ClaimSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277794041DF221F800573F3E /* ClaimSet.swift */; };
@@ -52,7 +49,6 @@
5249
CD9B623D1C7753FB005D4844 /* Decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71151C469F010005C709 /* Decode.swift */; };
5350
CD9B623E1C7753FB005D4844 /* Base64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71131C469F010005C709 /* Base64.swift */; };
5451
CD9B62421C7753FB005D4844 /* JWT.h in Headers */ = {isa = PBXBuildFile; fileRef = 279D63A11AD07FFF0024E2BC /* JWT.h */; settings = {ATTRIBUTES = (Public, ); }; };
55-
CD9B62891C7758BB005D4844 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
5652
/* End PBXBuildFile section */
5753

5854
/* Begin PBXContainerItemProxy section */
@@ -63,27 +59,6 @@
6359
remoteGlobalIDString = 279D639B1AD07FFF0024E2BC;
6460
remoteInfo = JWT;
6561
};
66-
66725DAA1C59202E00FC32F4 /* PBXContainerItemProxy */ = {
67-
isa = PBXContainerItemProxy;
68-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
69-
proxyType = 2;
70-
remoteGlobalIDString = 754BE45519693E190098E6F3;
71-
remoteInfo = "CryptoSwift iOS";
72-
};
73-
66725DB21C59202E00FC32F4 /* PBXContainerItemProxy */ = {
74-
isa = PBXContainerItemProxy;
75-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
76-
proxyType = 2;
77-
remoteGlobalIDString = 754BE46019693E190098E6F3;
78-
remoteInfo = CryptoSwiftTests;
79-
};
80-
CD9B628A1C7758CA005D4844 /* PBXContainerItemProxy */ = {
81-
isa = PBXContainerItemProxy;
82-
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
83-
proxyType = 1;
84-
remoteGlobalIDString = 754BE45419693E190098E6F3;
85-
remoteInfo = "CryptoSwift iOS";
86-
};
8762
/* End PBXContainerItemProxy section */
8863

8964
/* Begin PBXFileReference section */
@@ -105,7 +80,6 @@
10580
520A71161C469F010005C709 /* JWT.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JWT.swift; sourceTree = "<group>"; };
10681
520A711B1C469F440005C709 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
10782
540942F3614C41E3827F2013 /* Pods_JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
108-
66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CryptoSwift.xcodeproj; path = Carthage/Checkouts/CryptoSwift/CryptoSwift.xcodeproj; sourceTree = "<group>"; };
10983
CD9B62231C7753D8005D4844 /* JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
11084
CD9B62351C7753EC005D4844 /* JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
11185
CD9B62471C7753FB005D4844 /* JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -117,7 +91,6 @@
11791
isa = PBXFrameworksBuildPhase;
11892
buildActionMask = 2147483647;
11993
files = (
120-
2734C6A81D88001F00BFF9F1 /* CryptoSwift.framework in Frameworks */,
12194
);
12295
runOnlyForDeploymentPostprocessing = 0;
12396
};
@@ -133,23 +106,20 @@
133106
isa = PBXFrameworksBuildPhase;
134107
buildActionMask = 2147483647;
135108
files = (
136-
CD9B62891C7758BB005D4844 /* CryptoSwift.framework in Frameworks */,
137109
);
138110
runOnlyForDeploymentPostprocessing = 0;
139111
};
140112
CD9B622D1C7753EC005D4844 /* Frameworks */ = {
141113
isa = PBXFrameworksBuildPhase;
142114
buildActionMask = 2147483647;
143115
files = (
144-
2734C6A91D88002900BFF9F1 /* CryptoSwift.framework in Frameworks */,
145116
);
146117
runOnlyForDeploymentPostprocessing = 0;
147118
};
148119
CD9B623F1C7753FB005D4844 /* Frameworks */ = {
149120
isa = PBXFrameworksBuildPhase;
150121
buildActionMask = 2147483647;
151122
files = (
152-
2734C6AA1D88003000BFF9F1 /* CryptoSwift.framework in Frameworks */,
153123
);
154124
runOnlyForDeploymentPostprocessing = 0;
155125
};
@@ -159,7 +129,6 @@
159129
279D63921AD07FFF0024E2BC = {
160130
isa = PBXGroup;
161131
children = (
162-
66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */,
163132
520A711B1C469F440005C709 /* Package.swift */,
164133
520A71121C469F010005C709 /* Sources */,
165134
279D639E1AD07FFF0024E2BC /* Sources */,
@@ -236,15 +205,6 @@
236205
path = Sources;
237206
sourceTree = "<group>";
238207
};
239-
66725DA31C59202E00FC32F4 /* Products */ = {
240-
isa = PBXGroup;
241-
children = (
242-
66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */,
243-
66725DB31C59202E00FC32F4 /* Tests.xctest */,
244-
);
245-
name = Products;
246-
sourceTree = "<group>";
247-
};
248208
AC8AE547FDAF3DD80EB4DB2F /* Frameworks */ = {
249209
isa = PBXGroup;
250210
children = (
@@ -340,7 +300,6 @@
340300
buildRules = (
341301
);
342302
dependencies = (
343-
CD9B628B1C7758CA005D4844 /* PBXTargetDependency */,
344303
);
345304
name = "JWT-iOS";
346305
productName = JWT;
@@ -412,12 +371,6 @@
412371
mainGroup = 279D63921AD07FFF0024E2BC;
413372
productRefGroup = 279D639D1AD07FFF0024E2BC /* Products */;
414373
projectDirPath = "";
415-
projectReferences = (
416-
{
417-
ProductGroup = 66725DA31C59202E00FC32F4 /* Products */;
418-
ProjectRef = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
419-
},
420-
);
421374
projectRoot = "";
422375
targets = (
423376
279D639B1AD07FFF0024E2BC /* JWT-OSX */,
@@ -429,23 +382,6 @@
429382
};
430383
/* End PBXProject section */
431384

432-
/* Begin PBXReferenceProxy section */
433-
66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */ = {
434-
isa = PBXReferenceProxy;
435-
fileType = wrapper.framework;
436-
path = CryptoSwift.framework;
437-
remoteRef = 66725DAA1C59202E00FC32F4 /* PBXContainerItemProxy */;
438-
sourceTree = BUILT_PRODUCTS_DIR;
439-
};
440-
66725DB31C59202E00FC32F4 /* Tests.xctest */ = {
441-
isa = PBXReferenceProxy;
442-
fileType = wrapper.cfbundle;
443-
path = Tests.xctest;
444-
remoteRef = 66725DB21C59202E00FC32F4 /* PBXContainerItemProxy */;
445-
sourceTree = BUILT_PRODUCTS_DIR;
446-
};
447-
/* End PBXReferenceProxy section */
448-
449385
/* Begin PBXResourcesBuildPhase section */
450386
279D63A51AD07FFF0024E2BC /* Resources */ = {
451387
isa = PBXResourcesBuildPhase;
@@ -489,6 +425,7 @@
489425
isa = PBXSourcesBuildPhase;
490426
buildActionMask = 2147483647;
491427
files = (
428+
273011161F34029900219C35 /* HMACCommonCrypto.swift in Sources */,
492429
520A71181C469F010005C709 /* Claims.swift in Sources */,
493430
520A711A1C469F010005C709 /* JWT.swift in Sources */,
494431
520A71191C469F010005C709 /* Decode.swift in Sources */,
@@ -497,7 +434,6 @@
497434
277794051DF221F800573F3E /* ClaimSet.swift in Sources */,
498435
273010FF1F33EABA00219C35 /* HMAC.swift in Sources */,
499436
520A71171C469F010005C709 /* Base64.swift in Sources */,
500-
2730110A1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
501437
);
502438
runOnlyForDeploymentPostprocessing = 0;
503439
};
@@ -513,6 +449,7 @@
513449
isa = PBXSourcesBuildPhase;
514450
buildActionMask = 2147483647;
515451
files = (
452+
273011171F34029900219C35 /* HMACCommonCrypto.swift in Sources */,
516453
CD9B62171C7753D8005D4844 /* Claims.swift in Sources */,
517454
CD9B62181C7753D8005D4844 /* JWT.swift in Sources */,
518455
CD9B62191C7753D8005D4844 /* Decode.swift in Sources */,
@@ -521,14 +458,14 @@
521458
277794061DF221F800573F3E /* ClaimSet.swift in Sources */,
522459
273011001F33EABA00219C35 /* HMAC.swift in Sources */,
523460
CD9B621A1C7753D8005D4844 /* Base64.swift in Sources */,
524-
2730110B1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
525461
);
526462
runOnlyForDeploymentPostprocessing = 0;
527463
};
528464
CD9B62281C7753EC005D4844 /* Sources */ = {
529465
isa = PBXSourcesBuildPhase;
530466
buildActionMask = 2147483647;
531467
files = (
468+
273011181F34029A00219C35 /* HMACCommonCrypto.swift in Sources */,
532469
CD9B62291C7753EC005D4844 /* Claims.swift in Sources */,
533470
CD9B622A1C7753EC005D4844 /* JWT.swift in Sources */,
534471
CD9B622B1C7753EC005D4844 /* Decode.swift in Sources */,
@@ -537,14 +474,14 @@
537474
277794071DF221F800573F3E /* ClaimSet.swift in Sources */,
538475
273011011F33EABA00219C35 /* HMAC.swift in Sources */,
539476
CD9B622C1C7753EC005D4844 /* Base64.swift in Sources */,
540-
2730110C1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
541477
);
542478
runOnlyForDeploymentPostprocessing = 0;
543479
};
544480
CD9B623A1C7753FB005D4844 /* Sources */ = {
545481
isa = PBXSourcesBuildPhase;
546482
buildActionMask = 2147483647;
547483
files = (
484+
273011191F34029A00219C35 /* HMACCommonCrypto.swift in Sources */,
548485
CD9B623B1C7753FB005D4844 /* Claims.swift in Sources */,
549486
CD9B623C1C7753FB005D4844 /* JWT.swift in Sources */,
550487
CD9B623D1C7753FB005D4844 /* Decode.swift in Sources */,
@@ -553,7 +490,6 @@
553490
277794081DF221F800573F3E /* ClaimSet.swift in Sources */,
554491
273011021F33EABA00219C35 /* HMAC.swift in Sources */,
555492
CD9B623E1C7753FB005D4844 /* Base64.swift in Sources */,
556-
2730110D1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
557493
);
558494
runOnlyForDeploymentPostprocessing = 0;
559495
};
@@ -565,11 +501,6 @@
565501
target = 279D639B1AD07FFF0024E2BC /* JWT-OSX */;
566502
targetProxy = 279D63A91AD07FFF0024E2BC /* PBXContainerItemProxy */;
567503
};
568-
CD9B628B1C7758CA005D4844 /* PBXTargetDependency */ = {
569-
isa = PBXTargetDependency;
570-
name = "CryptoSwift iOS";
571-
targetProxy = CD9B628A1C7758CA005D4844 /* PBXContainerItemProxy */;
572-
};
573504
/* End PBXTargetDependency section */
574505

575506
/* Begin XCBuildConfiguration section */
@@ -616,6 +547,7 @@
616547
ONLY_ACTIVE_ARCH = YES;
617548
PRODUCT_NAME = "$(PROJECT_NAME)";
618549
SDKROOT = macosx;
550+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)";
619551
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
620552
SWIFT_VERSION = 3.0;
621553
VERSIONING_SYSTEM = "apple-generic";
@@ -659,6 +591,7 @@
659591
MTL_ENABLE_DEBUG_INFO = NO;
660592
PRODUCT_NAME = "$(PROJECT_NAME)";
661593
SDKROOT = macosx;
594+
SWIFT_INCLUDE_PATHS = "$(SRCROOT)";
662595
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
663596
SWIFT_VERSION = 3.0;
664597
VERSIONING_SYSTEM = "apple-generic";

0 commit comments

Comments
 (0)