open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Manos Chorianopoulos
7f342348 2 parents 45995de2 aad01936

Merge branch 'master' of https://git.warp.ly/open-source/warply_sdk_framework

Inline Side-by-side
Showing 4 changed files with 5 additions and 5 deletions
...@@ -922,6 +922,7 @@ ...@@ -922,6 +922,7 @@
922 isa = XCBuildConfiguration; 922 isa = XCBuildConfiguration;
923 baseConfigurationReference = F2447FDBC0B149DFB9DC6E40 /* Pods-WarplySDKFrameworkIOS.debug.xcconfig */; 923 baseConfigurationReference = F2447FDBC0B149DFB9DC6E40 /* Pods-WarplySDKFrameworkIOS.debug.xcconfig */;
924 buildSettings = { 924 buildSettings = {
925 + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
925 APPLICATION_EXTENSION_API_ONLY = NO; 926 APPLICATION_EXTENSION_API_ONLY = NO;
926 ARCHS = ( 927 ARCHS = (
927 "$(ARCHS_STANDARD)", 928 "$(ARCHS_STANDARD)",
...@@ -937,7 +938,6 @@ ...@@ -937,7 +938,6 @@
937 DYLIB_COMPATIBILITY_VERSION = 1; 938 DYLIB_COMPATIBILITY_VERSION = 1;
938 DYLIB_CURRENT_VERSION = 1; 939 DYLIB_CURRENT_VERSION = 1;
939 DYLIB_INSTALL_NAME_BASE = "@rpath"; 940 DYLIB_INSTALL_NAME_BASE = "@rpath";
940 - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
941 GENERATE_INFOPLIST_FILE = YES; 941 GENERATE_INFOPLIST_FILE = YES;
942 INFOPLIST_KEY_NSHumanReadableCopyright = ""; 942 INFOPLIST_KEY_NSHumanReadableCopyright = "";
943 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 943 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
...@@ -966,6 +966,7 @@ ...@@ -966,6 +966,7 @@
966 isa = XCBuildConfiguration; 966 isa = XCBuildConfiguration;
967 baseConfigurationReference = B9413513157AD76ECE896B81 /* Pods-WarplySDKFrameworkIOS.release.xcconfig */; 967 baseConfigurationReference = B9413513157AD76ECE896B81 /* Pods-WarplySDKFrameworkIOS.release.xcconfig */;
968 buildSettings = { 968 buildSettings = {
969 + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
969 APPLICATION_EXTENSION_API_ONLY = NO; 970 APPLICATION_EXTENSION_API_ONLY = NO;
970 ARCHS = ( 971 ARCHS = (
971 "$(ARCHS_STANDARD)", 972 "$(ARCHS_STANDARD)",
...@@ -981,7 +982,6 @@ ...@@ -981,7 +982,6 @@
981 DYLIB_COMPATIBILITY_VERSION = 1; 982 DYLIB_COMPATIBILITY_VERSION = 1;
982 DYLIB_CURRENT_VERSION = 1; 983 DYLIB_CURRENT_VERSION = 1;
983 DYLIB_INSTALL_NAME_BASE = "@rpath"; 984 DYLIB_INSTALL_NAME_BASE = "@rpath";
984 - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
985 GENERATE_INFOPLIST_FILE = YES; 985 GENERATE_INFOPLIST_FILE = YES;
986 INFOPLIST_KEY_NSHumanReadableCopyright = ""; 986 INFOPLIST_KEY_NSHumanReadableCopyright = "";
987 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; 987 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
...@@ -992,7 +992,7 @@ ...@@ -992,7 +992,7 @@
992 "@loader_path/Frameworks", 992 "@loader_path/Frameworks",
993 ); 993 );
994 MARKETING_VERSION = 1.0; 994 MARKETING_VERSION = 1.0;
995 - ONLY_ACTIVE_ARCH = YES; 995 + ONLY_ACTIVE_ARCH = NO;
996 PRODUCT_BUNDLE_IDENTIFIER = framework.warp.ly.WarplySDKFrameworkIOS; 996 PRODUCT_BUNDLE_IDENTIFIER = framework.warp.ly.WarplySDKFrameworkIOS;
997 PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; 997 PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
998 SKIP_INSTALL = YES; 998 SKIP_INSTALL = YES;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 15
16 @property (nonatomic, weak) Warply *warply; 16 @property (nonatomic, weak) Warply *warply;
17 17
18 -- (void)init:(NSDictionary *)launchOptions uuid:(NSString*)uuid merchantId:(NSString*)merchantId lang:(NSString*)lang; 18 +- (void) initialize:(NSDictionary *)launchOptions uuid:(NSString*)uuid merchantId:(NSString*)merchantId lang:(NSString*)lang;
19 - (void) setToStage; 19 - (void) setToStage;
20 - (void) setLang:(NSString*) lang; 20 - (void) setLang:(NSString*) lang;
21 - (void) getSteps:(void(^)(CMPedometerData* stepsData)) completion; 21 - (void) getSteps:(void(^)(CMPedometerData* stepsData)) completion;
......
...@@ -21,7 +21,7 @@ NSString *LANG; ...@@ -21,7 +21,7 @@ NSString *LANG;
21 NSDate *date; 21 NSDate *date;
22 CMPedometer *pedometer; 22 CMPedometer *pedometer;
23 23
24 -- (void)init:(NSDictionary *)launchOptions uuid:(NSString*)uuid merchantId:(NSString*)merchantId lang:(NSString*)lang{ 24 +- (void)initialize:(NSDictionary *)launchOptions uuid:(NSString*)uuid merchantId:(NSString*)merchantId lang:(NSString*)lang{
25 #if (DEBUG == 1) 25 #if (DEBUG == 1)
26 [Warply launchWithAppUUID:uuid launchOptions:launchOptions]; 26 [Warply launchWithAppUUID:uuid launchOptions:launchOptions];
27 #else 27 #else
......