Merge remote-tracking branch 'origin/master' into development

Author: Vitaliy G

PublicCocoaPods/QMChatViewController.podspec

@@ -11,7 +11,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "QMChatViewController"
-  s.version      = "0.4.1.1"
+  s.version      = "0.5"
   s.summary      = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
 
   s.description  = <<-DESC
@@ -32,27 +32,23 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/QuickBlox/QMChatViewController-ios.git", :tag => "#{s.version}" }
   s.source_files = "QMChatViewController/QMChatViewController.{h,m}"
 
-  s.subspec 'QMChatLocationSnapshotter' do |ss|
-    ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
-  end
-
   s.subspec 'Categories' do |ss|
-	   ss.dependency 'QMChatViewController/QMChatLocationSnapshotter'
      ss.source_files = 'QMChatViewController/Categories/*.{h,m}'
   end
 
   s.subspec 'Utils' do |ss|
-	   ss.dependency 'QMChatViewController/Categories'
-     ss.source_files = 'QMChatViewController/Utils/**/*.{h,m}'
+    ss.dependency 'QMChatViewController/Categories'
+    ss.source_files = 'QMChatViewController/Utils/**/*.{h,m}'
   end
 
-  s.subspec 'Sections' do |ss|
-	   ss.dependency 'QMChatViewController/QMChatDataSource'
-     ss.source_files = 'QMChatViewController/QMChatSection/*.{h,m}'
+  s.subspec 'QMChatLocationSnapshotter' do |ss|
+    ss.dependency 'QMChatViewController/Utils'
+    ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
   end
 
   s.subspec 'QMChatDataSource' do |ss|
-    ss.source_files = 'QMChatViewController/QMChatDataSource/*.{h,m}'
+    ss.dependency 'QMChatViewController/Utils'
+    ss.source_files = 'QMChatViewController/QMChatDataSource/**/*.{h,m}'
   end
 
   s.subspec 'Protocols' do |ss|
@@ -71,8 +67,9 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/QuickBlox/" }
   s.prefix_header_contents = '#import <Quickblox/Quickblox.h>'
-  s.dependency "QuickBlox", ">= 2.0"
+  s.dependency "QuickBlox", ">= 2.10"
   s.dependency "TTTAttributedLabel", "> 1.13"
-  s.dependency "SDWebImage", "~> 3.8.2"
+  s.dependency "SDWebImage", "~> 4.0.0"
+  s.dependency "FFCircularProgressView"
 
 end

QMCVDevelopment.podspec

@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "QMCVDevelopment"
-  s.version      = "0.4.1.1"
+  s.version      = "0.5"
   s.summary      = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
 
   s.description  = <<-DESC

…egories/UIImageView+QMLocationSnapshot.h …shotter/UIImageView+QMLocationSnapshot.hQMChatViewController/Categories/UIImageView+QMLocationSnapshot.h renamed to QMChatViewController/QMChatLocationSnapshotter/UIImageView+QMLocationSnapshot.h QMChatViewController/Categories/UIImageView+QMLocationSnapshot.h renamed to QMChatViewController/QMChatLocationSnapshotter/UIImageView+QMLocationSnapshot.h

@@ -37,7 +37,6 @@
 #import "QMChatBaseLinkPreviewCell.h"
 #import "QMChatIncomingLinkPreviewCell.h"
 #import "QMChatOutgoingLinkPreviewCell.h"
-#import "QMLinkPreviewChatModel.h"
 
 @interface QMChatViewController : UIViewController <QMChatCollectionViewDataSource, QMChatCollectionViewDelegateFlowLayout, UITextViewDelegate>
 

…egories/UIImageView+QMLocationSnapshot.m …shotter/UIImageView+QMLocationSnapshot.mQMChatViewController/Categories/UIImageView+QMLocationSnapshot.m renamed to QMChatViewController/QMChatLocationSnapshotter/UIImageView+QMLocationSnapshot.m QMChatViewController/Categories/UIImageView+QMLocationSnapshot.m renamed to QMChatViewController/QMChatLocationSnapshotter/UIImageView+QMLocationSnapshot.m

@@ -9,7 +9,6 @@
 #import "QMChatViewController.h"
 #import "QMChatCollectionView.h"
 #import "QMChatCollectionViewFlowLayout.h"
-#import "QMChatSection.h"
 #import "QMDateUtils.h"
 #import "QMChatResources.h"
 #import "NSString+QM.h"
@@ -80,7 +79,6 @@ - (void)viewDidLoad {
 
     [super viewDidLoad];
 
-    
     [self configureMessagesViewController];
 
     self.automaticallyAdjustsScrollViewInsets = NO;