Skip to content

Commit ec80611

Browse files
committed
Convert JWEResponse folder to group to fix build with older xcode
1 parent f33b05a commit ec80611

File tree

1 file changed

+32
-42
lines changed

1 file changed

+32
-42
lines changed

IdentityCore/IdentityCore.xcodeproj/project.pbxproj

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 70;
6+
objectVersion = 48;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -1933,6 +1933,11 @@
19331933
B4E6D8612A9F266F00FC7DD9 /* MSIDWebAuthNUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B4E6D8602A9F266F00FC7DD9 /* MSIDWebAuthNUtil.m */; };
19341934
B4E6D8622A9F268700FC7DD9 /* MSIDWebAuthNUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B4E6D85F2A9F253B00FC7DD9 /* MSIDWebAuthNUtil.h */; };
19351935
B4E6D8632A9F268B00FC7DD9 /* MSIDWebAuthNUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = B4E6D8602A9F266F00FC7DD9 /* MSIDWebAuthNUtil.m */; };
1936+
B4EC850E2EF65C58005567DA /* MSIDAesGcmDecryptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4EC850A2EF65C58005567DA /* MSIDAesGcmDecryptor.swift */; };
1937+
B4EC850F2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m in Sources */ = {isa = PBXBuildFile; fileRef = B4EC850C2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m */; };
1938+
B4EC85102EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.h in Headers */ = {isa = PBXBuildFile; fileRef = B4EC850B2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.h */; };
1939+
B4EC85112EF65C58005567DA /* MSIDAesGcmDecryptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4EC850A2EF65C58005567DA /* MSIDAesGcmDecryptor.swift */; };
1940+
B4EC85122EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m in Sources */ = {isa = PBXBuildFile; fileRef = B4EC850C2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m */; };
19361941
B86FA7D42383757100E5195A /* MSIDMacACLKeychainAccessorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B86FA7C62383748000E5195A /* MSIDMacACLKeychainAccessorTests.m */; };
19371942
B86FA7D52383757600E5195A /* MSIDMacTokenCacheTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B86FA7C72383748000E5195A /* MSIDMacTokenCacheTests.m */; };
19381943
B86FA7D62383757A00E5195A /* MSIDMacKeychainTokenCacheTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B86FA7C82383748000E5195A /* MSIDMacKeychainTokenCacheTests.m */; };
@@ -3452,6 +3457,9 @@
34523457
B4E6D85F2A9F253B00FC7DD9 /* MSIDWebAuthNUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDWebAuthNUtil.h; sourceTree = "<group>"; };
34533458
B4E6D8602A9F266F00FC7DD9 /* MSIDWebAuthNUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDWebAuthNUtil.m; sourceTree = "<group>"; };
34543459
B4EC84E12EF6394E005567DA /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
3460+
B4EC850A2EF65C58005567DA /* MSIDAesGcmDecryptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSIDAesGcmDecryptor.swift; sourceTree = "<group>"; };
3461+
B4EC850B2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDJweResponse+EcdhAesGcm.h"; sourceTree = "<group>"; };
3462+
B4EC850C2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MSIDJweResponse+EcdhAesGcm.m"; sourceTree = "<group>"; };
34553463
B86FA7C62383748000E5195A /* MSIDMacACLKeychainAccessorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDMacACLKeychainAccessorTests.m; sourceTree = "<group>"; };
34563464
B86FA7C72383748000E5195A /* MSIDMacTokenCacheTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDMacTokenCacheTests.m; sourceTree = "<group>"; };
34573465
B86FA7C82383748000E5195A /* MSIDMacKeychainTokenCacheTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDMacKeychainTokenCacheTests.m; sourceTree = "<group>"; };
@@ -3524,10 +3532,6 @@
35243532
F7AB272FEBCF984722F26558 /* MSIDWPJMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSIDWPJMetadata.m; sourceTree = "<group>"; };
35253533
/* End PBXFileReference section */
35263534

3527-
/* Begin PBXFileSystemSynchronizedRootGroup section */
3528-
724C9DFB2E6F90A90039BAA0 /* JWEResponse */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = JWEResponse; sourceTree = "<group>"; };
3529-
/* End PBXFileSystemSynchronizedRootGroup section */
3530-
35313535
/* Begin PBXFrameworksBuildPhase section */
35323536
1EE8FF5324F4BB3800CA1445 /* Frameworks */ = {
35333537
isa = PBXFrameworksBuildPhase;
@@ -5475,6 +5479,16 @@
54755479
path = Matchers;
54765480
sourceTree = "<group>";
54775481
};
5482+
B4EC850D2EF65C58005567DA /* JWEResponse */ = {
5483+
isa = PBXGroup;
5484+
children = (
5485+
B4EC850A2EF65C58005567DA /* MSIDAesGcmDecryptor.swift */,
5486+
B4EC850B2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.h */,
5487+
B4EC850C2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m */,
5488+
);
5489+
path = JWEResponse;
5490+
sourceTree = "<group>";
5491+
};
54785492
B86FA7C52383748000E5195A /* mac */ = {
54795493
isa = PBXGroup;
54805494
children = (
@@ -5791,7 +5805,7 @@
57915805
600D19A720964C330004CD43 /* workplacejoin */,
57925806
D62600091FBD305800EE4487 /* util */,
57935807
D6D9A4B91FBE6D1C00EFA430 /* IdentityCore.pch */,
5794-
724C9DFB2E6F90A90039BAA0 /* JWEResponse */,
5808+
B4EC850D2EF65C58005567DA /* JWEResponse */,
57955809
B2C7B3B1213C681F009FFCC1 /* MSIDErrorConverter.h */,
57965810
B2C7B3B2213C681F009FFCC1 /* MSIDErrorConverter.m */,
57975811
B2C7B3B6213C6838009FFCC1 /* MSIDErrorConverting.h */,
@@ -6454,6 +6468,7 @@
64546468
A0C7DD7C25D1E98D00F5B5B6 /* NSError+MSIDThrottlingExtension.h in Headers */,
64556469
B2E2A93D2392F91100BA2EA3 /* MSIDInteractiveTokenRequestParameters.h in Headers */,
64566470
B2C07486246B711B0008D701 /* MSIDAssymetricKeyLookupAttributes.h in Headers */,
6471+
B4EC85102EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.h in Headers */,
64576472
23D2048E21D1B499009B5975 /* MSIDAADJsonResponsePreprocessor.h in Headers */,
64586473
B2C07481246B70F70008D701 /* MSIDAssymetricKeyPair.h in Headers */,
64596474
B2CDB57C1FE33EC1003A4B5C /* MSIDIdTokenClaims.h in Headers */,
@@ -6770,9 +6785,6 @@
67706785
);
67716786
dependencies = (
67726787
);
6773-
fileSystemSynchronizedGroups = (
6774-
724C9DFB2E6F90A90039BAA0 /* JWEResponse */,
6775-
);
67766788
name = "IdentityCore Mac";
67776789
productName = IdentityCoreMac;
67786790
productReference = D626FF5B1FBA6E9500EE4487 /* libIdentityCore.a */;
@@ -6843,9 +6855,6 @@
68436855
);
68446856
dependencies = (
68456857
);
6846-
fileSystemSynchronizedGroups = (
6847-
724C9DFB2E6F90A90039BAA0 /* JWEResponse */,
6848-
);
68496858
name = "IdentityCore iOS";
68506859
productName = IdentityCore;
68516860
productReference = D68FB4871FBA698A005308BB /* libIdentityCore.a */;
@@ -7562,6 +7571,8 @@
75627571
230847A82082C5830024CE7C /* MSIDHttpRequest.m in Sources */,
75637572
B2AF1D42218BD10A0080C1A0 /* MSIDRequestParameters.m in Sources */,
75647573
04D32CB31FD62141000B123E /* MSIDError.m in Sources */,
7574+
B4EC85112EF65C58005567DA /* MSIDAesGcmDecryptor.swift in Sources */,
7575+
B4EC85122EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m in Sources */,
75657576
05566D112204BB8A002DBA40 /* MSIDMacKeychainTokenCache.m in Sources */,
75667577
23D2049021D1B499009B5975 /* MSIDAADJsonResponsePreprocessor.m in Sources */,
75677578
B286B9582385F01A007833AD /* MSIDOIDCSignoutRequest.m in Sources */,
@@ -8252,6 +8263,8 @@
82528263
B2C7081D2195284900D917B8 /* MSIDDefaultBrokerTokenRequest.m in Sources */,
82538264
60F94D322210E8BD0035D956 /* MSIDV1IdToken.m in Sources */,
82548265
B2C17AEC1FC796E60070A514 /* MSIDDeviceId.m in Sources */,
8266+
B4EC850E2EF65C58005567DA /* MSIDAesGcmDecryptor.swift in Sources */,
8267+
B4EC850F2EF65C58005567DA /* MSIDJweResponse+EcdhAesGcm.m in Sources */,
82558268
58BC2393271E0D94008A77BE /* MSIDSSOExtensionGetSsoCookiesRequest.m in Sources */,
82568269
239E3BBF23E1004F00F7A50A /* MSIDClientSDKType.m in Sources */,
82578270
23B39ABD209BD47D000AA905 /* MSIDB2CAuthorityResolver.m in Sources */,
@@ -8683,8 +8696,7 @@
86838696
SDKROOT = iphoneos;
86848697
SKIP_INSTALL = YES;
86858698
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos xrsimulator xros";
8686-
SWIFT_COMPILATION_MODE = wholemodule;
8687-
SWIFT_OPTIMIZATION_LEVEL = "-O";
8699+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
86888700
SWIFT_VERSION = 5.0;
86898701
TARGETED_DEVICE_FAMILY = "1,2,7";
86908702
VALIDATE_PRODUCT = YES;
@@ -8738,10 +8750,7 @@
87388750
GCC_WARN_UNUSED_VARIABLE = YES;
87398751
INFOPLIST_FILE = MSIDTestsHostApp/Info.plist;
87408752
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
8741-
LD_RUNPATH_SEARCH_PATHS = (
8742-
"$(inherited)",
8743-
"@executable_path/Frameworks",
8744-
);
8753+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
87458754
MACOSX_DEPLOYMENT_TARGET = 11.0;
87468755
MTL_ENABLE_DEBUG_INFO = YES;
87478756
ONLY_ACTIVE_ARCH = YES;
@@ -8794,10 +8803,7 @@
87948803
GCC_WARN_UNUSED_VARIABLE = YES;
87958804
INFOPLIST_FILE = MSIDTestsHostApp/Info.plist;
87968805
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
8797-
LD_RUNPATH_SEARCH_PATHS = (
8798-
"$(inherited)",
8799-
"@executable_path/Frameworks",
8800-
);
8806+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
88018807
MACOSX_DEPLOYMENT_TARGET = 11.0;
88028808
MTL_ENABLE_DEBUG_INFO = NO;
88038809
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSIDTestsHostApp;
@@ -9328,11 +9334,7 @@
93289334
GCC_OPTIMIZATION_LEVEL = 0;
93299335
HEADER_SEARCH_PATHS = "$(SRCROOT)/include/";
93309336
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
9331-
LD_RUNPATH_SEARCH_PATHS = (
9332-
"$(inherited)",
9333-
"@executable_path/Frameworks",
9334-
"@loader_path/Frameworks",
9335-
);
9337+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
93369338
PROVISIONING_PROFILE_SPECIFIER = "";
93379339
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
93389340
SWIFT_OBJC_BRIDGING_HEADER = "tests/IdentityCoreTests-Bridging-Header.h";
@@ -9354,11 +9356,7 @@
93549356
ENABLE_BITCODE = NO;
93559357
HEADER_SEARCH_PATHS = "$(SRCROOT)/include/";
93569358
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
9357-
LD_RUNPATH_SEARCH_PATHS = (
9358-
"$(inherited)",
9359-
"@executable_path/Frameworks",
9360-
"@loader_path/Frameworks",
9361-
);
9359+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
93629360
PROVISIONING_PROFILE_SPECIFIER = "";
93639361
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
93649362
SWIFT_OBJC_BRIDGING_HEADER = "tests/IdentityCoreTests-Bridging-Header.h";
@@ -9413,11 +9411,7 @@
94139411
CODE_SIGN_STYLE = Automatic;
94149412
DEVELOPMENT_TEAM = UBF8T346G9;
94159413
GCC_OPTIMIZATION_LEVEL = 0;
9416-
LD_RUNPATH_SEARCH_PATHS = (
9417-
"$(inherited)",
9418-
"@executable_path/../Frameworks",
9419-
"@loader_path/../Frameworks",
9420-
);
9414+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
94219415
MACOSX_DEPLOYMENT_TARGET = 11.0;
94229416
SWIFT_OBJC_BRIDGING_HEADER = "tests/IdentityCoreTests-Bridging-Header.h";
94239417
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -9433,11 +9427,7 @@
94339427
CODE_SIGN_IDENTITY = "-";
94349428
CODE_SIGN_STYLE = Automatic;
94359429
DEVELOPMENT_TEAM = UBF8T346G9;
9436-
LD_RUNPATH_SEARCH_PATHS = (
9437-
"$(inherited)",
9438-
"@executable_path/../Frameworks",
9439-
"@loader_path/../Frameworks",
9440-
);
9430+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
94419431
MACOSX_DEPLOYMENT_TARGET = 11.0;
94429432
SWIFT_OBJC_BRIDGING_HEADER = "tests/IdentityCoreTests-Bridging-Header.h";
94439433
SWIFT_VERSION = 5.0;

0 commit comments

Comments
 (0)