User profile feature.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYBuilder.h

@@ -47,6 +47,8 @@ typedef void (^OPTLYBuilderBlock)(OPTLYBuilder * _Nullable builder);
 /// User profile stores user-specific data, like bucketing.
 @property (nonatomic, strong, nullable) id<OPTLYUserProfile> userProfile;
 
+@property (nonatomic, strong, nullable) id<OPTLYUserProfile> userProfile;
+
 /// Create an Optimizely Builder object.
 + (nullable instancetype)builderWithBlock:(nonnull OPTLYBuilderBlock)block;
 

OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.m

@@ -30,6 +30,7 @@
 #import "OPTLYVariable.h"
 #import "OPTLYUserProfile.h"
 #import "OPTLYVariable.h"
+#import "OPTLYUserProfile.h"
 
 NSString * const kClientEngine             = @"objective-c-sdk-core";
 

OptimizelySDKCore/OptimizelySDKCore/OPTLYUserProfile.h

@@ -19,7 +19,11 @@
 @protocol OPTLYUserProfile <NSObject>
 
 /**
+<<<<<<< eaea1f01bff1164fa6a86549b9594aa7b0b2a460
  * Saves a user ID's project-to-experiment-to-variation mapping.
+=======
+ * Saves a user id's project-to-experiment-to-variation mapping.
+>>>>>>> User profile feature.
  *
  * @param userId The user id that was used to generate the bucket value.
  * @param experimentKey An active experiment for which the user should be bucketed into.

OptimizelySDKCore/OptimizelySDKCore/OPTLYUserProfile.m

@@ -20,14 +20,22 @@ @implementation OPTLYUserProfile
 
 + (BOOL)conformsToOPTLYUserProfileProtocol:(nonnull Class)instanceClass {
     // compile-time check
+<<<<<<< eaea1f01bff1164fa6a86549b9594aa7b0b2a460
     BOOL isValidProtocolDeclaration = [instanceClass conformsToProtocol:@protocol(OPTLYUserProfile)];
+=======
+    BOOL validProtocolDeclaration = [instanceClass conformsToProtocol:@protocol(OPTLYUserProfile)];
+>>>>>>> User profile feature.
 
     // runtime checks
     BOOL implementsHandleSaveVariationMethod = [instanceClass instancesRespondToSelector:@selector(save:experiment:variation:)];
     BOOL implementsHandleGetVariationMethod = [instanceClass instancesRespondToSelector:@selector(getVariationFor:experiment:)];
     BOOL implementsHandleRemoveVariationMethod = [instanceClass instancesRespondToSelector:@selector(remove:experiment:)];
 
+<<<<<<< eaea1f01bff1164fa6a86549b9594aa7b0b2a460
     return isValidProtocolDeclaration && implementsHandleSaveVariationMethod && implementsHandleGetVariationMethod && implementsHandleRemoveVariationMethod;
+=======
+    return validProtocolDeclaration && implementsHandleSaveVariationMethod && implementsHandleGetVariationMethod && implementsHandleRemoveVariationMethod;
+>>>>>>> User profile feature.
 }
 
 @end