Merge branch 'master' into development

QuickBlox · Sep 7, 2017 · 8b0d0a3 · 8b0d0a3
2 parents ee299ed + 6f18698
commit 8b0d0a3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/PublicCocoaPods/QMServices.podspec b/PublicCocoaPods/QMServices.podspec
@@ -10,26 +10,32 @@
 
 
 Pod::Spec.new do |s|
-  s.name         = "QMServices"
-  s.version      = "0.5"
-  s.summary      = "Easy-to-use services for Quickblox SDK, for speeding up development of iOS chat applications."
-  s.homepage     = "https://github.com/QuickBlox/q-municate-services-ios"
-  s.license      = { :type => 'BSD', :file => 'LICENSE.txt' }
-  s.authors      = {"Andrey Ivanov" => "[email protected]", "Vitaliy Gorbachov" => "[email protected]", "Vitaliy Gurkovsky" => "[email protected]"}
-  s.platform     = :ios, "8.0"
-  s.source       = { :git => "https://github.com/QuickBlox/q-municate-services-ios.git", :tag => "#{s.version}"}
-  s.source_files  = "Classes", "**/*.{h,m}"
-  s.exclude_files = "Pods", "Frameworks"
-  s.frameworks = "CoreData"
-  s.requires_arc = true
-  s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/QuickBlox/" }
-  s.prefix_header_contents =
-  '#import <Quickblox/Quickblox.h>
-#import <CoreData/CoreData.h>
-#import <Quickblox/QBMulticastDelegate.h>
-#import <Bolts/Bolts.h>'
-  s.resource_bundle = {'QMChatCacheModel' => 'QMChatCache/QMChatCache/CoreData/QMChatServiceModel.xcdatamodeld', 'QMContactListCacheModel' => 'QMContactListCache/QMContactListCache/CoreData/QMContactListModel.xcdatamodeld', 'QMUsersCacheModel' => 'QMUsersCache/QMUsersCache/CoreData/QMUsersModel.xcdatamodeld'}
+    s.name         = "QMServices"
+    s.version      = "0.5.1"
+    s.summary      = "Easy-to-use services for Quickblox SDK, for speeding up development of iOS chat applications."
+    s.homepage     = "https://github.com/QuickBlox/q-municate-services-ios"
+    s.license      = { :type => 'BSD', :file => 'LICENSE.txt' }
+    s.authors      = {"Andrey Ivanov" => "[email protected]", "Vitaliy Gorbachov" => "[email protected]", "Vitaliy Gurkovsky" => "[email protected]"}
+    s.platform     = :ios, "8.0"
+    s.source       = { :git => "https://github.com/QuickBlox/q-municate-services-ios.git", :tag => "#{s.version}"}
+    s.source_files  = "Classes", "**/*.{h,m}"
+    s.exclude_files = "Pods", "Frameworks"
+    s.frameworks = "CoreData"
+    s.requires_arc = true
+    s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/QuickBlox/" }
+    s.prefix_header_contents =
+    '#import <Quickblox/Quickblox.h>
+    #import <CoreData/CoreData.h>
+    #import <Quickblox/QBMulticastDelegate.h>
+    #import <Bolts/Bolts.h>'
 
-  s.dependency "QuickBlox", ">= 2.10"
-  s.dependency "Bolts",  '>= 1.5.0'
+    s.resource_bundle = {
+        'QMChatCacheModel' => 'QMChatCache/QMChatCache/CoreData/QMChatServiceModel.xcdatamodeld',
+        'QMContactListCacheModel' => 'QMContactListCache/QMContactListCache/CoreData/QMContactListModel.xcdatamodeld',
+        'QMUsersCacheModel' => 'QMUsersCache/QMUsersCache/CoreData/QMUsersModel.xcdatamodeld',
+        'QMOpenGraphCacheModel' => 'QMOpenGraphCache/QMOpenGraphCache/CoreData/QMOpenGraphModel.xcdatamodeld'
+        }
+
+    s.dependency "QuickBlox", ">= 2.10"
+    s.dependency "Bolts",  '>= 1.5.0'
 end
diff --git a/QMManagers/QMServicesManager.m b/QMManagers/QMServicesManager.m
@@ -96,12 +96,6 @@ - (void)logoutWithCompletion:(dispatch_block_t)completion {
             [QMChatCache.instance truncateAll:^{
                 dispatch_group_leave(logoutGroup);
             }];
-
-            dispatch_group_enter(logoutGroup);
-            [QMOpenGraphCache.instance deleteAllOpenGraphItemsWithCompletion:^{
-
-                dispatch_group_leave(logoutGroup);
-            }];
 
             dispatch_group_notify(logoutGroup, dispatch_get_main_queue(), ^{
 

diff --git a/QMServicesDevelopment.podspec b/QMServicesDevelopment.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "QMServicesDevelopment"
-  s.version      = "0.5"
+  s.version      = "0.5.1"
   s.summary      = "Easy-to-use services for Quickblox SDK, for speeding up development of iOS chat applications."
   s.homepage     = "https://github.com/QuickBlox/q-municate-services-ios"
   s.license      = { :type => 'BSD', :file => 'LICENSE.txt' }