Skip to content

Commit 0c3f65f

Browse files
committed
Merge branch 'master' into development
* master: up version 0.6.2 Public speck update fixed public pod spec
2 parents c1791b6 + ab5638a commit 0c3f65f

3 files changed

Lines changed: 56 additions & 47 deletions

File tree

PublicCocoaPods/QMChatViewController.podspec

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
Pod::Spec.new do |s|
1212

13-
s.name = "QMChatViewController"
14-
s.version = "0.6.1"
15-
s.summary = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
13+
s.name = "QMChatViewController"
14+
s.version = "0.6.2"
15+
s.summary = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
1616

17-
s.description = <<-DESC
17+
s.description = <<-DESC
1818
* Ready-to-go chat view controller with a set of cells.
1919
* Automatic cell size calculation.
2020
* UI customisation for chat cells.
@@ -25,51 +25,63 @@ Pod::Spec.new do |s|
2525
* Auto Layout inside.
2626
DESC
2727

28-
s.homepage = "https://github.com/QuickBlox/QMChatViewController-ios"
29-
s.license = { :type => "BSD", :file => "LICENSE" }
30-
s.authors = {"Andrey Ivanov" => "andrey.ivanov@quickblox.com", "Vitaliy Gorbachov" => "vitaliy.gorbachov@quickblox.com", "Vitaliy Gurkovsky" => "vitaliy.gurkovsky@injoit.com"}
31-
s.platform = :ios, "9.0"
32-
s.source = { :git => "https://github.com/QuickBlox/QMChatViewController-ios.git", :tag => "#{s.version}" }
33-
s.source_files = "QMChatViewController/QMChatViewController.{h,m}"
28+
s.homepage = "https://github.com/QuickBlox/QMChatViewController-ios"
29+
s.license = { :type => "BSD", :file => "LICENSE" }
30+
s.authors = {
31+
"Andrey Ivanov" => "andrey.ivanov@quickblox.com",
32+
"Vitaliy Gorbachov" => "vitaliy.gorbachov@quickblox.com",
33+
"Vitaliy Gurkovsky" => "vitaliy.gurkovsky@injoit.com"
34+
}
35+
s.platform = :ios, "9.0"
36+
s.source = {
37+
:git => "https://github.com/QuickBlox/QMChatViewController-ios.git",
38+
:tag => "#{s.version}"
39+
}
40+
s.source_files = "QMChatViewController/QMChatViewController.{h,m}"
3441

35-
s.subspec 'Categories' do |ss|
36-
ss.source_files = 'QMChatViewController/Categories/*.{h,m}'
37-
end
42+
s.subspec 'Categories' do |ss|
43+
ss.source_files = 'QMChatViewController/Categories/*.{h,m}'
44+
end
3845

39-
s.subspec 'Utils' do |ss|
40-
ss.dependency 'QMChatViewController/Categories'
41-
ss.source_files = 'QMChatViewController/Utils/**/*.{h,m}'
42-
end
46+
s.subspec 'Utils' do |ss|
47+
ss.dependency 'QMChatViewController/Categories'
48+
ss.source_files = 'QMChatViewController/Utils/**/*.{h,m}'
49+
end
4350

44-
s.subspec 'QMChatLocationSnapshotter' do |ss|
45-
ss.dependency 'QMChatViewController/Utils'
46-
ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
47-
end
51+
s.subspec 'QMChatLocationSnapshotter' do |ss|
52+
ss.dependency 'QMChatViewController/Utils'
53+
ss.source_files = 'QMChatViewController/QMChatLocationSnapshotter/*.{h,m}'
54+
end
4855

49-
s.subspec 'QMChatDataSource' do |ss|
50-
ss.dependency 'QMChatViewController/Utils'
51-
ss.source_files = 'QMChatViewController/QMChatDataSource/**/*.{h,m}'
52-
end
56+
s.subspec 'QMChatDataSource' do |ss|
57+
ss.dependency 'QMChatViewController/Utils'
58+
ss.source_files = 'QMChatViewController/QMChatDataSource/**/*.{h,m}'
59+
end
5360

54-
s.subspec 'Protocols' do |ss|
55-
ss.source_files = 'QMChatViewController/Protocols/*.{h}'
56-
end
61+
s.subspec 'Protocols' do |ss|
62+
ss.source_files = 'QMChatViewController/Protocols/*.{h}'
63+
end
5764

58-
s.subspec 'Views' do |ss|
59-
ss.dependency 'QMChatViewController/Categories'
60-
ss.dependency 'QMChatViewController/Protocols'
61-
ss.dependency 'QMChatViewController/Utils'
62-
ss.source_files = 'QMChatViewController/Views/**/*.{h,m}'
63-
end
65+
s.subspec 'Views' do |ss|
66+
ss.dependency 'QMChatViewController/Categories'
67+
ss.dependency 'QMChatViewController/Protocols'
68+
ss.dependency 'QMChatViewController/Utils'
69+
ss.source_files = 'QMChatViewController/Views/**/*.{h,m}'
70+
end
6471

65-
s.resource_bundles = { "QMChatViewController" => ["QMChatViewController/**/*.xib", "QMChatViewController/**/*.png"] }
66-
s.resources = "QMChatViewController/Icons/Media.xcassets"
67-
s.requires_arc = true
68-
s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/QuickBlox/" }
69-
s.prefix_header_contents = '#import <Quickblox/Quickblox.h>'
70-
s.dependency "QuickBlox"
71-
s.dependency "TTTAttributedLabel"
72-
s.dependency "SDWebImage"
73-
s.dependency "FFCircularProgressView"
72+
s.resource_bundles = {
73+
'QMChatViewController' => [
74+
'QMChatViewController/**/*.xcassets',
75+
'QMChatViewController/**/*.xib'
76+
]
77+
}
78+
s.resource = 'QMChatViewController/**/*.xcassets'
79+
s.requires_arc = true
80+
s.xcconfig = { "FRAMEWORK_SEARCH_PATHS" => "$(PODS_ROOT)/QuickBlox/" }
81+
s.prefix_header_contents = '#import <Quickblox/Quickblox.h>'
82+
s.dependency "QuickBlox"
83+
s.dependency "TTTAttributedLabel"
84+
s.dependency "SDWebImage"
85+
s.dependency "FFCircularProgressView"
7486

7587
end

QMChatViewController.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Pod::Spec.new do |s|
1010

1111
s.name = "QMChatViewController"
12-
s.version = "0.6.1"
12+
s.version = "0.6.2"
1313
s.summary = "An elegant ready-to-go chat view controller for iOS chat applications that use Quickblox communication backend."
1414

1515
s.description = <<-DESC

QMChatViewController/Views/QMChatContainerView.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@
1919
@property (assign, nonatomic) IBInspectable BOOL arrow;
2020
@property (assign, nonatomic) IBInspectable BOOL leftArrow;
2121
@property (assign, nonatomic) IBInspectable CGSize arrowSize;
22-
2322
@property (assign, nonatomic) BOOL highlighted;
24-
2523
@property (readonly, strong, nonatomic) UIImage *backgroundImage;
26-
2724
@property (readonly, strong, nonatomic) UIBezierPath *maskPath;
2825

2926

0 commit comments

Comments
 (0)