Merge commit '59538b64f1c297b5a19bb6a5c25fe373f91879d0'

# Conflicts: # Sources/ConfigCatUser.swift
configcat · Oct 30, 2020 · 0f43826 · 0f43826
2 parents 42c7f0e + 59538b6
commit 0f43826
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ConfigCat.podspec b/ConfigCat.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name          = "ConfigCat"
-  spec.version       = "6.0.0"
+  spec.version       = "6.0.1"
   spec.summary       = "ConfigCat Swift SDK"
   spec.swift_version = "4.2"
 

diff --git a/samples/osx/configcatsample-objc/main.m b/samples/osx/configcatsample-objc/main.m
@@ -5,14 +5,15 @@ int main(int argc, const char * argv[]) {
     @autoreleasepool {
         // Initialize the ConfigCatClient with an SDK Key.
         ConfigCatClient* client = [[ConfigCatClient alloc]initWithSdkKey:@"PKDVCLf-Hq-h-kCzMp-L7Q/HhOWfwVtZ0mb30i9wi17GQ"
+                                                          dataGovernance:DataGovernanceGlobal
                                                              configCache:nil
                                                            refreshMode:nil
                                         maxWaitTimeForSyncCallsInSeconds:0
                                                     sessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
                                                                  baseUrl:@""];
 
         // Creating a user object to identify your user (optional).
-        User* userObject = [[User alloc]initWithIdentifier:@"Some UserID"
+        CCUser* userObject = [[CCUser alloc]initWithIdentifier:@"Some UserID"
                                                      email:@"[email protected]"
                                                    country:@"CountryID"
                                                     custom:@{@"version": @"1.0.0"}];