Skip to content

Use CommonCrypto in Xcode #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2017
Merged

Use CommonCrypto in Xcode #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aee8d90
feat: Use CommonCrypto in Xcode
kylef Aug 4, 2017
9b7463f
fix: Allow Xcode to find CommonCrypto
kylef Aug 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Cartfile
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Cartfile.resolved
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Carthage/Checkouts/CryptoSwift
Open in desktop
Submodule CryptoSwift deleted from 5f9bb9
87 changes: 10 additions & 77 deletions JWT.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@
273011001F33EABA00219C35 /* HMAC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273010FE1F33EABA00219C35 /* HMAC.swift */; };
273011011F33EABA00219C35 /* HMAC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273010FE1F33EABA00219C35 /* HMAC.swift */; };
273011021F33EABA00219C35 /* HMAC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273010FE1F33EABA00219C35 /* HMAC.swift */; };
2730110A1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
2730110B1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
2730110C1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
2730110D1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011091F33FC9100219C35 /* HMACCryptoSwift.swift */; };
2734C6A81D88001F00BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
2734C6A91D88002900BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
2734C6AA1D88003000BFF9F1 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
273011161F34029900219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
273011171F34029900219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
273011181F34029A00219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
273011191F34029A00219C35 /* HMACCommonCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 273011041F33FC5F00219C35 /* HMACCommonCrypto.swift */; };
277794051DF221F800573F3E /* ClaimSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277794041DF221F800573F3E /* ClaimSet.swift */; };
277794061DF221F800573F3E /* ClaimSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277794041DF221F800573F3E /* ClaimSet.swift */; };
277794071DF221F800573F3E /* ClaimSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 277794041DF221F800573F3E /* ClaimSet.swift */; };
Expand Down Expand Up @@ -52,7 +49,6 @@
CD9B623D1C7753FB005D4844 /* Decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71151C469F010005C709 /* Decode.swift */; };
CD9B623E1C7753FB005D4844 /* Base64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 520A71131C469F010005C709 /* Base64.swift */; };
CD9B62421C7753FB005D4844 /* JWT.h in Headers */ = {isa = PBXBuildFile; fileRef = 279D63A11AD07FFF0024E2BC /* JWT.h */; settings = {ATTRIBUTES = (Public, ); }; };
CD9B62891C7758BB005D4844 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -63,27 +59,6 @@
remoteGlobalIDString = 279D639B1AD07FFF0024E2BC;
remoteInfo = JWT;
};
66725DAA1C59202E00FC32F4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 754BE45519693E190098E6F3;
remoteInfo = "CryptoSwift iOS";
};
66725DB21C59202E00FC32F4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 754BE46019693E190098E6F3;
remoteInfo = CryptoSwiftTests;
};
CD9B628A1C7758CA005D4844 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 754BE45419693E190098E6F3;
remoteInfo = "CryptoSwift iOS";
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
Expand All @@ -105,7 +80,6 @@
520A71161C469F010005C709 /* JWT.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JWT.swift; sourceTree = "<group>"; };
520A711B1C469F440005C709 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
540942F3614C41E3827F2013 /* Pods_JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = CryptoSwift.xcodeproj; path = Carthage/Checkouts/CryptoSwift/CryptoSwift.xcodeproj; sourceTree = "<group>"; };
CD9B62231C7753D8005D4844 /* JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CD9B62351C7753EC005D4844 /* JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CD9B62471C7753FB005D4844 /* JWT.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JWT.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -117,7 +91,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2734C6A81D88001F00BFF9F1 /* CryptoSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -133,23 +106,20 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CD9B62891C7758BB005D4844 /* CryptoSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
CD9B622D1C7753EC005D4844 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2734C6A91D88002900BFF9F1 /* CryptoSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
CD9B623F1C7753FB005D4844 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2734C6AA1D88003000BFF9F1 /* CryptoSwift.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -159,7 +129,6 @@
279D63921AD07FFF0024E2BC = {
isa = PBXGroup;
children = (
66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */,
520A711B1C469F440005C709 /* Package.swift */,
520A71121C469F010005C709 /* Sources */,
279D639E1AD07FFF0024E2BC /* Sources */,
Expand Down Expand Up @@ -236,15 +205,6 @@
path = Sources;
sourceTree = "<group>";
};
66725DA31C59202E00FC32F4 /* Products */ = {
isa = PBXGroup;
children = (
66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */,
66725DB31C59202E00FC32F4 /* Tests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
AC8AE547FDAF3DD80EB4DB2F /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -340,7 +300,6 @@
buildRules = (
);
dependencies = (
CD9B628B1C7758CA005D4844 /* PBXTargetDependency */,
);
name = "JWT-iOS";
productName = JWT;
Expand Down Expand Up @@ -412,12 +371,6 @@
mainGroup = 279D63921AD07FFF0024E2BC;
productRefGroup = 279D639D1AD07FFF0024E2BC /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 66725DA31C59202E00FC32F4 /* Products */;
ProjectRef = 66725DA21C59202E00FC32F4 /* CryptoSwift.xcodeproj */;
},
);
projectRoot = "";
targets = (
279D639B1AD07FFF0024E2BC /* JWT-OSX */,
Expand All @@ -429,23 +382,6 @@
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
66725DAB1C59202E00FC32F4 /* CryptoSwift.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = CryptoSwift.framework;
remoteRef = 66725DAA1C59202E00FC32F4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
66725DB31C59202E00FC32F4 /* Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = Tests.xctest;
remoteRef = 66725DB21C59202E00FC32F4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
279D63A51AD07FFF0024E2BC /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand Down Expand Up @@ -489,6 +425,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
273011161F34029900219C35 /* HMACCommonCrypto.swift in Sources */,
520A71181C469F010005C709 /* Claims.swift in Sources */,
520A711A1C469F010005C709 /* JWT.swift in Sources */,
520A71191C469F010005C709 /* Decode.swift in Sources */,
Expand All @@ -497,7 +434,6 @@
277794051DF221F800573F3E /* ClaimSet.swift in Sources */,
273010FF1F33EABA00219C35 /* HMAC.swift in Sources */,
520A71171C469F010005C709 /* Base64.swift in Sources */,
2730110A1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -513,6 +449,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
273011171F34029900219C35 /* HMACCommonCrypto.swift in Sources */,
CD9B62171C7753D8005D4844 /* Claims.swift in Sources */,
CD9B62181C7753D8005D4844 /* JWT.swift in Sources */,
CD9B62191C7753D8005D4844 /* Decode.swift in Sources */,
Expand All @@ -521,14 +458,14 @@
277794061DF221F800573F3E /* ClaimSet.swift in Sources */,
273011001F33EABA00219C35 /* HMAC.swift in Sources */,
CD9B621A1C7753D8005D4844 /* Base64.swift in Sources */,
2730110B1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
CD9B62281C7753EC005D4844 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
273011181F34029A00219C35 /* HMACCommonCrypto.swift in Sources */,
CD9B62291C7753EC005D4844 /* Claims.swift in Sources */,
CD9B622A1C7753EC005D4844 /* JWT.swift in Sources */,
CD9B622B1C7753EC005D4844 /* Decode.swift in Sources */,
Expand All @@ -537,14 +474,14 @@
277794071DF221F800573F3E /* ClaimSet.swift in Sources */,
273011011F33EABA00219C35 /* HMAC.swift in Sources */,
CD9B622C1C7753EC005D4844 /* Base64.swift in Sources */,
2730110C1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
CD9B623A1C7753FB005D4844 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
273011191F34029A00219C35 /* HMACCommonCrypto.swift in Sources */,
CD9B623B1C7753FB005D4844 /* Claims.swift in Sources */,
CD9B623C1C7753FB005D4844 /* JWT.swift in Sources */,
CD9B623D1C7753FB005D4844 /* Decode.swift in Sources */,
Expand All @@ -553,7 +490,6 @@
277794081DF221F800573F3E /* ClaimSet.swift in Sources */,
273011021F33EABA00219C35 /* HMAC.swift in Sources */,
CD9B623E1C7753FB005D4844 /* Base64.swift in Sources */,
2730110D1F33FC9100219C35 /* HMACCryptoSwift.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -565,11 +501,6 @@
target = 279D639B1AD07FFF0024E2BC /* JWT-OSX */;
targetProxy = 279D63A91AD07FFF0024E2BC /* PBXContainerItemProxy */;
};
CD9B628B1C7758CA005D4844 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "CryptoSwift iOS";
targetProxy = CD9B628A1C7758CA005D4844 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -616,6 +547,7 @@
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = macosx;
SWIFT_INCLUDE_PATHS = "$(SRCROOT)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -659,6 +591,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = "$(PROJECT_NAME)";
SDKROOT = macosx;
SWIFT_INCLUDE_PATHS = "$(SRCROOT)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down