Skip to content

Commit d2aa171

Browse files
talipatpacetalipatpace
committed
Merge branch 'implement-token-exchange' into 'master'
Change implement token exchange Closes #384 See merge request pace/mobile/ios/pace-cloud-sdk!442
2 parents a3b398e + 2f050e6 commit d2aa171

File tree

11 files changed

+407
-264
lines changed

11 files changed

+407
-264
lines changed

‎ExampleApp/PACECloudSDKExample.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
@@ -15,8 +15,6 @@
1515
3B784C4F26B3E84800B1D859 /* QA-Test.gpx in Resources */ = {isa = PBXBuildFile; fileRef = 3B784C4E26B3E84800B1D859 /* QA-Test.gpx */; };
1616
3B784C5226B3E85700B1D859 /* HEM(Baden).gpx in Resources */ = {isa = PBXBuildFile; fileRef = 3B784C5126B3E85700B1D859 /* HEM(Baden).gpx */; };
1717
3B784C5426B3E86000B1D859 /* Kirche-Jet.gpx in Resources */ = {isa = PBXBuildFile; fileRef = 3B784C5326B3E86000B1D859 /* Kirche-Jet.gpx */; };
18-
3B784C6C26B3EA8900B1D859 /* PACECloudSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B784C6126B3EA7400B1D859 /* PACECloudSDK.framework */; };
19-
3B784C6D26B3EA8900B1D859 /* PACECloudSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B784C6126B3EA7400B1D859 /* PACECloudSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2018
3B784C7026B3F26500B1D859 /* Color+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B784C6F26B3F26500B1D859 /* Color+Extension.swift */; };
2119
3B784C7226B3F79C00B1D859 /* CGFloat+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B784C7126B3F79C00B1D859 /* CGFloat+Extension.swift */; };
2220
3B784C7526B3FC2D00B1D859 /* IDControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B784C7426B3FC2D00B1D859 /* IDControl.swift */; };
@@ -70,61 +68,17 @@
7068
6ACBC02A26FA1FB100E6AC05 /* Zip in Frameworks */ = {isa = PBXBuildFile; productRef = 6ACBC02926FA1FB100E6AC05 /* Zip */; };
7169
6ACBC03026FB758800E6AC05 /* ExampleLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ACBC02F26FB758800E6AC05 /* ExampleLogger.swift */; };
7270
6ACBC03626FDC17D00E6AC05 /* ShareObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6ACBC03526FDC17D00E6AC05 /* ShareObject.swift */; };
71+
F23A93132EB0E66200E4DE8B /* PACECloudSDK in Frameworks */ = {isa = PBXBuildFile; productRef = F23A93122EB0E66200E4DE8B /* PACECloudSDK */; };
72+
F23A93252EB8EC6A00E4DE8B /* PACECloudSDK in Frameworks */ = {isa = PBXBuildFile; productRef = F23A93242EB8EC6A00E4DE8B /* PACECloudSDK */; };
7373
/* End PBXBuildFile section */
7474

75-
/* Begin PBXContainerItemProxy section */
76-
3B784C6026B3EA7400B1D859 /* PBXContainerItemProxy */ = {
77-
isa = PBXContainerItemProxy;
78-
containerPortal = 3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */;
79-
proxyType = 2;
80-
remoteGlobalIDString = 921E682C2534883100438491;
81-
remoteInfo = PACECloudSDK;
82-
};
83-
3B784C6226B3EA7400B1D859 /* PBXContainerItemProxy */ = {
84-
isa = PBXContainerItemProxy;
85-
containerPortal = 3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */;
86-
proxyType = 2;
87-
remoteGlobalIDString = 92EDDBCD25A71EEB00E480F4;
88-
remoteInfo = PACECloudSlimSDK;
89-
};
90-
3B784C6426B3EA7400B1D859 /* PBXContainerItemProxy */ = {
91-
isa = PBXContainerItemProxy;
92-
containerPortal = 3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */;
93-
proxyType = 2;
94-
remoteGlobalIDString = 921E68352534883200438491;
95-
remoteInfo = PACECloudSDKTests;
96-
};
97-
3B784C6626B3EA7400B1D859 /* PBXContainerItemProxy */ = {
98-
isa = PBXContainerItemProxy;
99-
containerPortal = 3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */;
100-
proxyType = 2;
101-
remoteGlobalIDString = 3BA6A760260DD06A005D4B5C;
102-
remoteInfo = UnitTestDummy;
103-
};
104-
3B784C6826B3EA7400B1D859 /* PBXContainerItemProxy */ = {
105-
isa = PBXContainerItemProxy;
106-
containerPortal = 3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */;
107-
proxyType = 2;
108-
remoteGlobalIDString = 17BB0CD7268CCED6009D4755;
109-
remoteInfo = PACECloudWatchSDK;
110-
};
111-
3B784C6A26B3EA8100B1D859 /* PBXContainerItemProxy */ = {
112-
isa = PBXContainerItemProxy;
113-
containerPortal = 3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */;
114-
proxyType = 1;
115-
remoteGlobalIDString = 921E682B2534883100438491;
116-
remoteInfo = PACECloudSDK;
117-
};
118-
/* End PBXContainerItemProxy section */
119-
12075
/* Begin PBXCopyFilesBuildPhase section */
121-
3B784C6E26B3EA8A00B1D859 /* Embed Frameworks */ = {
76+
F23A92FA2EA8FD3F00E4DE8B /* Embed Frameworks */ = {
12277
isa = PBXCopyFilesBuildPhase;
12378
buildActionMask = 2147483647;
12479
dstPath = "";
12580
dstSubfolderSpec = 10;
12681
files = (
127-
3B784C6D26B3EA8900B1D859 /* PACECloudSDK.framework in Embed Frameworks */,
12882
);
12983
name = "Embed Frameworks";
13084
runOnlyForDeploymentPostprocessing = 0;
@@ -142,7 +96,6 @@
14296
3B784C4E26B3E84800B1D859 /* QA-Test.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "QA-Test.gpx"; sourceTree = "<group>"; };
14397
3B784C5126B3E85700B1D859 /* HEM(Baden).gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "HEM(Baden).gpx"; sourceTree = "<group>"; };
14498
3B784C5326B3E86000B1D859 /* Kirche-Jet.gpx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Kirche-Jet.gpx"; sourceTree = "<group>"; };
145-
3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PACECloudSDK.xcodeproj; path = ../PACECloudSDK.xcodeproj; sourceTree = "<group>"; };
14699
3B784C6F26B3F26500B1D859 /* Color+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extension.swift"; sourceTree = "<group>"; };
147100
3B784C7126B3F79C00B1D859 /* CGFloat+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGFloat+Extension.swift"; sourceTree = "<group>"; };
148101
3B784C7426B3FC2D00B1D859 /* IDControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IDControl.swift; sourceTree = "<group>"; };
@@ -205,8 +158,9 @@
205158
isa = PBXFrameworksBuildPhase;
206159
buildActionMask = 2147483647;
207160
files = (
161+
F23A93252EB8EC6A00E4DE8B /* PACECloudSDK in Frameworks */,
162+
F23A93132EB0E66200E4DE8B /* PACECloudSDK in Frameworks */,
208163
6ACBC02A26FA1FB100E6AC05 /* Zip in Frameworks */,
209-
3B784C6C26B3EA8900B1D859 /* PACECloudSDK.framework in Frameworks */,
210164
);
211165
runOnlyForDeploymentPostprocessing = 0;
212166
};
@@ -302,23 +256,10 @@
302256
3B784C5726B3EA7300B1D859 /* Frameworks */ = {
303257
isa = PBXGroup;
304258
children = (
305-
3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */,
306259
);
307260
name = Frameworks;
308261
sourceTree = "<group>";
309262
};
310-
3B784C5926B3EA7300B1D859 /* Products */ = {
311-
isa = PBXGroup;
312-
children = (
313-
3B784C6126B3EA7400B1D859 /* PACECloudSDK.framework */,
314-
3B784C6326B3EA7400B1D859 /* PACECloudSlimSDK.framework */,
315-
3B784C6526B3EA7400B1D859 /* PACECloudSDKTests.xctest */,
316-
3B784C6726B3EA7400B1D859 /* UnitTestDummy.app */,
317-
3B784C6926B3EA7400B1D859 /* PACECloudWatchSDK.framework */,
318-
);
319-
name = Products;
320-
sourceTree = "<group>";
321-
};
322263
3B784C7626B3FC8D00B1D859 /* Controls */ = {
323264
isa = PBXGroup;
324265
children = (
@@ -483,17 +424,18 @@
483424
3B784C2E26B3E5E500B1D859 /* Sources */,
484425
3B784C2F26B3E5E500B1D859 /* Frameworks */,
485426
3B784C3026B3E5E500B1D859 /* Resources */,
486-
3B784C6E26B3EA8A00B1D859 /* Embed Frameworks */,
427+
F23A92FA2EA8FD3F00E4DE8B /* Embed Frameworks */,
487428
);
488429
buildRules = (
489430
);
490431
dependencies = (
491432
CB55C49A2DB0EAD3000BBBCB /* PBXTargetDependency */,
492-
3B784C6B26B3EA8100B1D859 /* PBXTargetDependency */,
493433
);
494434
name = PACECloudSDKExample;
495435
packageProductDependencies = (
496436
6ACBC02926FA1FB100E6AC05 /* Zip */,
437+
F23A93122EB0E66200E4DE8B /* PACECloudSDK */,
438+
F23A93242EB8EC6A00E4DE8B /* PACECloudSDK */,
497439
);
498440
productName = PACECloudSDKExample;
499441
productReference = 3B784C3226B3E5E500B1D859 /* PACECloudSDKExample.app */;
@@ -525,60 +467,17 @@
525467
packageReferences = (
526468
6ACBC02826FA1FB100E6AC05 /* XCRemoteSwiftPackageReference "Zip" */,
527469
0B6203212BDBE51000BC7D59 /* XCRemoteSwiftPackageReference "SwiftLint" */,
470+
F23A93232EB8EC6A00E4DE8B /* XCLocalSwiftPackageReference "../" */,
528471
);
529472
productRefGroup = 3B784C3326B3E5E500B1D859 /* Products */;
530473
projectDirPath = "";
531-
projectReferences = (
532-
{
533-
ProductGroup = 3B784C5926B3EA7300B1D859 /* Products */;
534-
ProjectRef = 3B784C5826B3EA7300B1D859 /* PACECloudSDK.xcodeproj */;
535-
},
536-
);
537474
projectRoot = "";
538475
targets = (
539476
3B784C3126B3E5E500B1D859 /* PACECloudSDKExample */,
540477
);
541478
};
542479
/* End PBXProject section */
543480

544-
/* Begin PBXReferenceProxy section */
545-
3B784C6126B3EA7400B1D859 /* PACECloudSDK.framework */ = {
546-
isa = PBXReferenceProxy;
547-
fileType = wrapper.framework;
548-
path = PACECloudSDK.framework;
549-
remoteRef = 3B784C6026B3EA7400B1D859 /* PBXContainerItemProxy */;
550-
sourceTree = BUILT_PRODUCTS_DIR;
551-
};
552-
3B784C6326B3EA7400B1D859 /* PACECloudSlimSDK.framework */ = {
553-
isa = PBXReferenceProxy;
554-
fileType = wrapper.framework;
555-
path = PACECloudSlimSDK.framework;
556-
remoteRef = 3B784C6226B3EA7400B1D859 /* PBXContainerItemProxy */;
557-
sourceTree = BUILT_PRODUCTS_DIR;
558-
};
559-
3B784C6526B3EA7400B1D859 /* PACECloudSDKTests.xctest */ = {
560-
isa = PBXReferenceProxy;
561-
fileType = wrapper.cfbundle;
562-
path = PACECloudSDKTests.xctest;
563-
remoteRef = 3B784C6426B3EA7400B1D859 /* PBXContainerItemProxy */;
564-
sourceTree = BUILT_PRODUCTS_DIR;
565-
};
566-
3B784C6726B3EA7400B1D859 /* UnitTestDummy.app */ = {
567-
isa = PBXReferenceProxy;
568-
fileType = wrapper.application;
569-
path = UnitTestDummy.app;
570-
remoteRef = 3B784C6626B3EA7400B1D859 /* PBXContainerItemProxy */;
571-
sourceTree = BUILT_PRODUCTS_DIR;
572-
};
573-
3B784C6926B3EA7400B1D859 /* PACECloudWatchSDK.framework */ = {
574-
isa = PBXReferenceProxy;
575-
fileType = wrapper.framework;
576-
path = PACECloudWatchSDK.framework;
577-
remoteRef = 3B784C6826B3EA7400B1D859 /* PBXContainerItemProxy */;
578-
sourceTree = BUILT_PRODUCTS_DIR;
579-
};
580-
/* End PBXReferenceProxy section */
581-
582481
/* Begin PBXResourcesBuildPhase section */
583482
3B784C3026B3E5E500B1D859 /* Resources */ = {
584483
isa = PBXResourcesBuildPhase;
@@ -660,11 +559,6 @@
660559
/* End PBXSourcesBuildPhase section */
661560

662561
/* Begin PBXTargetDependency section */
663-
3B784C6B26B3EA8100B1D859 /* PBXTargetDependency */ = {
664-
isa = PBXTargetDependency;
665-
name = PACECloudSDK;
666-
targetProxy = 3B784C6A26B3EA8100B1D859 /* PBXContainerItemProxy */;
667-
};
668562
CB55C49A2DB0EAD3000BBBCB /* PBXTargetDependency */ = {
669563
isa = PBXTargetDependency;
670564
productRef = CB55C4992DB0EAD3000BBBCB /* SwiftLintBuildToolPlugin */;
@@ -921,13 +815,99 @@
921815
};
922816
name = Sandbox;
923817
};
818+
F23A92FB2EB0A3A900E4DE8B /* DevelopmentTokenExchange */ = {
819+
isa = XCBuildConfiguration;
820+
buildSettings = {
821+
ALWAYS_SEARCH_USER_PATHS = NO;
822+
CLANG_ANALYZER_NONNULL = YES;
823+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
824+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
825+
CLANG_CXX_LIBRARY = "libc++";
826+
CLANG_ENABLE_MODULES = YES;
827+
CLANG_ENABLE_OBJC_ARC = YES;
828+
CLANG_ENABLE_OBJC_WEAK = YES;
829+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
830+
CLANG_WARN_BOOL_CONVERSION = YES;
831+
CLANG_WARN_COMMA = YES;
832+
CLANG_WARN_CONSTANT_CONVERSION = YES;
833+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
834+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
835+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
836+
CLANG_WARN_EMPTY_BODY = YES;
837+
CLANG_WARN_ENUM_CONVERSION = YES;
838+
CLANG_WARN_INFINITE_RECURSION = YES;
839+
CLANG_WARN_INT_CONVERSION = YES;
840+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
841+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
842+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
843+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
844+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
845+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
846+
CLANG_WARN_STRICT_PROTOTYPES = YES;
847+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
848+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
849+
CLANG_WARN_UNREACHABLE_CODE = YES;
850+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
851+
COPY_PHASE_STRIP = NO;
852+
DEBUG_INFORMATION_FORMAT = dwarf;
853+
ENABLE_STRICT_OBJC_MSGSEND = YES;
854+
ENABLE_TESTABILITY = YES;
855+
GCC_C_LANGUAGE_STANDARD = gnu11;
856+
GCC_DYNAMIC_NO_PIC = NO;
857+
GCC_NO_COMMON_BLOCKS = YES;
858+
GCC_OPTIMIZATION_LEVEL = 0;
859+
GCC_PREPROCESSOR_DEFINITIONS = (
860+
"DEBUG=1",
861+
"$(inherited)",
862+
);
863+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
864+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
865+
GCC_WARN_UNDECLARED_SELECTOR = YES;
866+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
867+
GCC_WARN_UNUSED_FUNCTION = YES;
868+
GCC_WARN_UNUSED_VARIABLE = YES;
869+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
870+
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
871+
MTL_FAST_MATH = YES;
872+
ONLY_ACTIVE_ARCH = YES;
873+
SDKROOT = iphoneos;
874+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
875+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
876+
};
877+
name = DevelopmentTokenExchange;
878+
};
879+
F23A92FC2EB0A3A900E4DE8B /* DevelopmentTokenExchange */ = {
880+
isa = XCBuildConfiguration;
881+
buildSettings = {
882+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
883+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
884+
CODE_SIGN_STYLE = Automatic;
885+
DEVELOPMENT_ASSET_PATHS = "\"PACECloudSDKExample/Preview Content\"";
886+
DEVELOPMENT_TEAM = 8T694MPXAZ;
887+
ENABLE_BITCODE = NO;
888+
ENABLE_PREVIEWS = YES;
889+
INFOPLIST_FILE = PACECloudSDKExample/Info.plist;
890+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
891+
LD_RUNPATH_SEARCH_PATHS = (
892+
"$(inherited)",
893+
"@executable_path/Frameworks",
894+
);
895+
PRODUCT_BUNDLE_IDENTIFIER = car.pace.PACECloudSDKExample;
896+
PRODUCT_NAME = "$(TARGET_NAME)";
897+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEVELOPMENT TOKEN_EXCHANGE";
898+
SWIFT_VERSION = 5.0;
899+
TARGETED_DEVICE_FAMILY = 1;
900+
};
901+
name = DevelopmentTokenExchange;
902+
};
924903
/* End XCBuildConfiguration section */
925904

926905
/* Begin XCConfigurationList section */
927906
3B784C2D26B3E5E500B1D859 /* Build configuration list for PBXProject "PACECloudSDKExample" */ = {
928907
isa = XCConfigurationList;
929908
buildConfigurations = (
930909
3B784C3F26B3E5E600B1D859 /* Development */,
910+
F23A92FB2EB0A3A900E4DE8B /* DevelopmentTokenExchange */,
931911
3B784C4726B3E7E500B1D859 /* Sandbox */,
932912
3B784C4026B3E5E600B1D859 /* Production */,
933913
);
@@ -938,6 +918,7 @@
938918
isa = XCConfigurationList;
939919
buildConfigurations = (
940920
3B784C4226B3E5E600B1D859 /* Development */,
921+
F23A92FC2EB0A3A900E4DE8B /* DevelopmentTokenExchange */,
941922
3B784C4826B3E7E500B1D859 /* Sandbox */,
942923
3B784C4326B3E5E600B1D859 /* Production */,
943924
);
@@ -946,6 +927,13 @@
946927
};
947928
/* End XCConfigurationList section */
948929

930+
/* Begin XCLocalSwiftPackageReference section */
931+
F23A93232EB8EC6A00E4DE8B /* XCLocalSwiftPackageReference "../" */ = {
932+
isa = XCLocalSwiftPackageReference;
933+
relativePath = ../;
934+
};
935+
/* End XCLocalSwiftPackageReference section */
936+
949937
/* Begin XCRemoteSwiftPackageReference section */
950938
0B6203212BDBE51000BC7D59 /* XCRemoteSwiftPackageReference "SwiftLint" */ = {
951939
isa = XCRemoteSwiftPackageReference;
@@ -976,6 +964,14 @@
976964
package = 0B6203212BDBE51000BC7D59 /* XCRemoteSwiftPackageReference "SwiftLint" */;
977965
productName = "plugin:SwiftLintBuildToolPlugin";
978966
};
967+
F23A93122EB0E66200E4DE8B /* PACECloudSDK */ = {
968+
isa = XCSwiftPackageProductDependency;
969+
productName = PACECloudSDK;
970+
};
971+
F23A93242EB8EC6A00E4DE8B /* PACECloudSDK */ = {
972+
isa = XCSwiftPackageProductDependency;
973+
productName = PACECloudSDK;
974+
};
979975
/* End XCSwiftPackageProductDependency section */
980976
};
981977
rootObject = 3B784C2A26B3E5E500B1D859 /* Project object */;

0 commit comments

Comments
 (0)