Merge pull request #1241 from QuickBlox/develop

IlliaChemolosov · web-flow · commit 88056bfdac44 · 2020-10-08T18:14:01.000+03:00
QuickBlox-SDK 2.17.5
diff --git a/Framework/Quickblox.framework/Headers/QBASession.h b/Framework/Quickblox.framework/Headers/QBASession.h
@@ -6,11 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#if __has_include("QBCEntity.h")
-#import "QBCEntity.h"
-#else
-#import <QBCEntity.h>
-#endif
+#import <Quickblox/QBCEntity.h>
 
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Framework/Quickblox.framework/Headers/QBCBlob.h b/Framework/Quickblox.framework/Headers/QBCBlob.h
@@ -6,13 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#if __has_include("QBCEntity.h")
-#import "QBCEntity.h"
-#import "QBContentEnums.h"
-#else
-#import <QBCEntity.h>
-#import <QBContentEnums.h>
-#endif
+#import <Quickblox/QBCEntity.h>
+#import <Quickblox/QBContentEnums.h>
 
 @class QBCBlobObjectAccess;
 
diff --git a/Framework/Quickblox.framework/Headers/QBCBlobObjectAccess.h b/Framework/Quickblox.framework/Headers/QBCBlobObjectAccess.h
@@ -5,13 +5,8 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 #import <Foundation/Foundation.h>
-#if __has_include("QBCEntity.h")
-#import "QBCEntity.h"
-#import "QBContentEnums.h"
-#else
-#import <QBCEntity.h>
-#import <QBContentEnums.h>
-#endif
+#import <Quickblox/QBCEntity.h>
+#import <Quickblox/QBContentEnums.h>
 
 /**
  *  QBCBlobObjectAccess class interface.
diff --git a/Framework/Quickblox.framework/Headers/QBCOPermissions.h b/Framework/Quickblox.framework/Headers/QBCOPermissions.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBCustomObjectsEnums.h"
+#import <Quickblox/QBCustomObjectsEnums.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBChat.h b/Framework/Quickblox.framework/Headers/QBChat.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBChatTypes.h"
+#import <Quickblox/QBChatTypes.h>
 
 @protocol QBChatDelegate;
 
diff --git a/Framework/Quickblox.framework/Headers/QBChatDelegate.h b/Framework/Quickblox.framework/Headers/QBChatDelegate.h
@@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
  
  @param error Error.
  */
-- (void)chatDidDisconnectWithError:(NSError *)error;
+- (void)chatDidDisconnectWithError:(NSError * _Nullable)error;
 
 /**
  Called whenever QBChat did accidentally disconnect.
diff --git a/Framework/Quickblox.framework/Headers/QBConnection.h b/Framework/Quickblox.framework/Headers/QBConnection.h
@@ -4,7 +4,7 @@
 //  Created by QuickBlox team
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 
-#import "QBSettings.h"
+#import <Quickblox/QBSettings.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBMEvent.h b/Framework/Quickblox.framework/Headers/QBMEvent.h
@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBCEntity.h"
-#import "QBPushNotificationsEnums.h"
+#import <Quickblox/QBCEntity.h>
+#import <Quickblox/QBPushNotificationsEnums.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBMPushMessage.h b/Framework/Quickblox.framework/Headers/QBMPushMessage.h
@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 
-#import "QBMPushMessageBase.h"
+#import <Quickblox/QBMPushMessageBase.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBMPushToken.h b/Framework/Quickblox.framework/Headers/QBMPushToken.h
@@ -5,7 +5,7 @@
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
 #import <Foundation/Foundation.h>
-#import "QBCEntity.h"
+#import <Quickblox/QBCEntity.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBMSubscription.h b/Framework/Quickblox.framework/Headers/QBMSubscription.h
@@ -6,9 +6,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBCEntity.h"
-#import "QBMSubscription.h"
-#import "QBPushNotificationsEnums.h"
+#import <Quickblox/QBCEntity.h>
+#import <Quickblox/QBMSubscription.h>
+#import <Quickblox/QBPushNotificationsEnums.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBRequest+QBAddressBook.h b/Framework/Quickblox.framework/Headers/QBRequest+QBAddressBook.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBRequest.h"
+#import <Quickblox/QBRequest.h>
 
 @class QBAddressBookContact;
 @class QBAddressBookUpdates;
diff --git a/Framework/Quickblox.framework/Headers/QBRequest+QBAuth.h b/Framework/Quickblox.framework/Headers/QBRequest+QBAuth.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBRequest.h"
+#import <Quickblox/QBRequest.h>
 
 @class QBUUser;
 
diff --git a/Framework/Quickblox.framework/Headers/QBRequest+QBChat.h b/Framework/Quickblox.framework/Headers/QBRequest+QBChat.h
@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBRequest.h"
-#import "QBCompletionTypes.h"
+#import <Quickblox/QBRequest.h>
+#import <Quickblox/QBCompletionTypes.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBRequest+QBContent.h b/Framework/Quickblox.framework/Headers/QBRequest+QBContent.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBRequest.h"
+#import <Quickblox/QBRequest.h>
 
 @class QBCBlob;
 @class QBCBlobObjectAccess;
diff --git a/Framework/Quickblox.framework/Headers/QBRequest+QBCustomObjects.h b/Framework/Quickblox.framework/Headers/QBRequest+QBCustomObjects.h
@@ -6,8 +6,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBRequest.h"
-#import "QBCustomObjectsConsts.h"
+#import <Quickblox/QBRequest.h>
+#import <Quickblox/QBCustomObjectsConsts.h>
 
 @class QBResponsePage;
 @class QBCOCustomObject;
diff --git a/Framework/Quickblox.framework/Headers/QBRequest+QBPushNotifications.h b/Framework/Quickblox.framework/Headers/QBRequest+QBPushNotifications.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBRequest.h"
+#import <Quickblox/QBRequest.h>
 
 @class QBMPushToken;
 @class QBMSubscription;
diff --git a/Framework/Quickblox.framework/Headers/QBRequest+QBUsers.h b/Framework/Quickblox.framework/Headers/QBRequest+QBUsers.h
@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QBRequest.h"
+#import <Quickblox/QBRequest.h>
 
 @class QBUUser;
 @class QBGeneralResponsePage;
diff --git a/Framework/Quickblox.framework/Headers/QBSettings.h b/Framework/Quickblox.framework/Headers/QBSettings.h
@@ -5,7 +5,7 @@
 //  Copyright 2011 QuickBlox team. All rights reserved.
 //
 
-#import "QBLoggerEnums.h"
+#import <Quickblox/QBLoggerEnums.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/QBUUser.h b/Framework/Quickblox.framework/Headers/QBUUser.h
@@ -4,7 +4,7 @@
 //  Created by QuickBlox team
 //  Copyright (c) 2017 QuickBlox. All rights reserved.
 //
-#import "QBCEntity.h"
+#import <Quickblox/QBCEntity.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Framework/Quickblox.framework/Headers/Quickblox.h b/Framework/Quickblox.framework/Headers/Quickblox.h
@@ -4,60 +4,60 @@
 //
 //  Copyright (c) 2016 QuickBlox. All rights reserved.
 
-#import "QBAddressBookContact.h"
-#import "QBAddressBookRejectDetails.h"
-#import "QBAddressBookUpdates.h"
-#import "QBASession.h"
-#import "QBCBlob.h"
-#import "QBCBlobObjectAccess.h"
-#import "QBCEntity.h"
-#import "QBChat.h"
-#import "QBChatAttachment.h"
-#import "QBChatDelegate.h"
-#import "QBChatDialog.h"
-#import "QBChatMessage.h"
-#import "QBChatTypes.h"
-#import "QBCOCustomObject.h"
-#import "QBCOFile.h"
-#import "QBCOFileUploadInfo.h"
-#import "QBCompletionTypes.h"
-#import "QBContactList.h"
-#import "QBContactListItem.h"
-#import "QBContentEnums.h"
-#import "QBConnection.h"
-#import "QBCOPermissions.h"
-#import "QBCustomObjectsConsts.h"
-#import "QBCustomObjectsEnums.h"
-#import "QBDarwinNotificationCenter.h"
-#import "QBError.h"
-#import "QBGeneralResponsePage.h"
-#import "QBHTTPClient.h"
-#import "QBLoggerEnums.h"
-#import "QBMEvent.h"
-#import "QBMPushMessage.h"
-#import "QBMPushMessageBase.h"
-#import "QBMPushToken.h"
-#import "QBMSubscription.h"
-#import "QBMulticastDelegate.h"
-#import "QBPrivacyItem.h"
-#import "QBPrivacyList.h"
-#import "QBPushNotificationsConsts.h"
-#import "QBPushNotificationsEnums.h"
-#import "QBRequest.h"
-#import "QBRequest+QBAddressBook.h"
-#import "QBRequest+QBAuth.h"
-#import "QBRequest+QBChat.h"
-#import "QBRequest+QBContent.h"
-#import "QBRequest+QBCustomObjects.h"
-#import "QBRequest+QBPushNotifications.h"
-#import "QBRequest+QBUsers.h"
-#import "QBRequestStatus.h"
-#import "QBResponse.h"
-#import "QBResponsePage.h"
-#import "QBSession.h"
-#import "QBSettings.h"
-#import "QBUpdateUserParameters.h"
-#import "QBUUser.h"
+#import <Quickblox/QBAddressBookContact.h>
+#import <Quickblox/QBAddressBookRejectDetails.h>
+#import <Quickblox/QBAddressBookUpdates.h>
+#import <Quickblox/QBASession.h>
+#import <Quickblox/QBCBlob.h>
+#import <Quickblox/QBCBlobObjectAccess.h>
+#import <Quickblox/QBCEntity.h>
+#import <Quickblox/QBChat.h>
+#import <Quickblox/QBChatAttachment.h>
+#import <Quickblox/QBChatDelegate.h>
+#import <Quickblox/QBChatDialog.h>
+#import <Quickblox/QBChatMessage.h>
+#import <Quickblox/QBChatTypes.h>
+#import <Quickblox/QBCOCustomObject.h>
+#import <Quickblox/QBCOFile.h>
+#import <Quickblox/QBCOFileUploadInfo.h>
+#import <Quickblox/QBCompletionTypes.h>
+#import <Quickblox/QBContactList.h>
+#import <Quickblox/QBContactListItem.h>
+#import <Quickblox/QBContentEnums.h>
+#import <Quickblox/QBConnection.h>
+#import <Quickblox/QBCOPermissions.h>
+#import <Quickblox/QBCustomObjectsConsts.h>
+#import <Quickblox/QBCustomObjectsEnums.h>
+#import <Quickblox/QBDarwinNotificationCenter.h>
+#import <Quickblox/QBError.h>
+#import <Quickblox/QBGeneralResponsePage.h>
+#import <Quickblox/QBHTTPClient.h>
+#import <Quickblox/QBLoggerEnums.h>
+#import <Quickblox/QBMEvent.h>
+#import <Quickblox/QBMPushMessage.h>
+#import <Quickblox/QBMPushMessageBase.h>
+#import <Quickblox/QBMPushToken.h>
+#import <Quickblox/QBMSubscription.h>
+#import <Quickblox/QBMulticastDelegate.h>
+#import <Quickblox/QBPrivacyItem.h>
+#import <Quickblox/QBPrivacyList.h>
+#import <Quickblox/QBPushNotificationsConsts.h>
+#import <Quickblox/QBPushNotificationsEnums.h>
+#import <Quickblox/QBRequest.h>
+#import <Quickblox/QBRequest+QBAddressBook.h>
+#import <Quickblox/QBRequest+QBAuth.h>
+#import <Quickblox/QBRequest+QBChat.h>
+#import <Quickblox/QBRequest+QBContent.h>
+#import <Quickblox/QBRequest+QBCustomObjects.h>
+#import <Quickblox/QBRequest+QBPushNotifications.h>
+#import <Quickblox/QBRequest+QBUsers.h>
+#import <Quickblox/QBRequestStatus.h>
+#import <Quickblox/QBResponse.h>
+#import <Quickblox/QBResponsePage.h>
+#import <Quickblox/QBSession.h>
+#import <Quickblox/QBSettings.h>
+#import <Quickblox/QBUpdateUserParameters.h>
+#import <Quickblox/QBUUser.h>
 
-/// Framework version 2.17.4
+/// Framework version 2.17.5
 FOUNDATION_EXPORT NSString * const QuickbloxFrameworkVersion;
diff --git a/Framework/Quickblox.framework/Info.plist b/Framework/Quickblox.framework/Info.plist
diff --git a/Framework/Quickblox.framework/Quickblox b/Framework/Quickblox.framework/Quickblox
diff --git a/README.md b/README.md
@@ -36,8 +36,8 @@ This project contains QuickBlox iOS Samples and latest version of SDK, that incl
 
 ## Requirements
 
-* Xcode 9+
-* iOS SDK 8+
+* Xcode 11+
+* iOS SDK 12+
 
 ## How to start
 
