Skip to content

Commit

Permalink
Merge pull request #381 from badoo/release_3.2
Browse files Browse the repository at this point in the history
Release 3.2
  • Loading branch information
AntonPalich authored Oct 20, 2017
2 parents 9945b5c + 87715e6 commit 27f82d9
Show file tree
Hide file tree
Showing 18 changed files with 140 additions and 146 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.2.0
2 changes: 1 addition & 1 deletion Chatto.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Chatto"
s.version = "3.1.0"
s.version = "3.2.0"
s.summary = "Chat framework in Swift"
s.description = <<-DESC
Lightweight chat framework to build Chat apps
Expand Down
2 changes: 1 addition & 1 deletion Chatto/Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.1.0</string>
<string>3.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion ChattoAdditions.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ChattoAdditions"
s.version = "3.1.0"
s.version = "3.2.0"
s.summary = "UI componentes for Chatto"
s.description = <<-DESC
Text and photo bubbles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ open class PhotoMessagePresenterBuilder<ViewModelBuilderT, InteractionHandlerT>:

public let viewModelBuilder: ViewModelBuilderT
public let interactionHandler: InteractionHandlerT?
public lazy var sizingCell: PhotoMessageCollectionViewCell = PhotoMessageCollectionViewCell.sizingCell()
public let sizingCell: PhotoMessageCollectionViewCell = PhotoMessageCollectionViewCell.sizingCell()
public lazy var photoCellStyle: PhotoMessageCollectionViewCellStyleProtocol = PhotoMessageCollectionViewCellDefaultStyle()
public lazy var baseCellStyle: BaseMessageCollectionViewCellStyleProtocol = BaseMessageCollectionViewCellDefaultStyle()

Expand Down
2 changes: 1 addition & 1 deletion ChattoAdditions/Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.1.1</string>
<string>3.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion ChattoApp/ChattoApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
F8D7533B1E7B2E137B143EBD /* [CP] Copy Pods Resources */ = {
Expand Down
14 changes: 7 additions & 7 deletions ChattoApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- Chatto (3.1.0)
- ChattoAdditions (3.1.0):
- Chatto (3.2.0)
- ChattoAdditions (3.2.0):
- Chatto

DEPENDENCIES:
Expand All @@ -9,14 +9,14 @@ DEPENDENCIES:

EXTERNAL SOURCES:
Chatto:
:path: ".."
:path: ..
ChattoAdditions:
:path: ".."
:path: ..

SPEC CHECKSUMS:
Chatto: dc39056aed56fcababb857affd8152606afb2b5a
ChattoAdditions: 4f54c932c08488fca0a85f211094276f03f4ee60
Chatto: 49676707c36ccb831ecb23e0969b890b2da91f08
ChattoAdditions: c4c8827790b9c9885002f6b91f210fd3632dc60a

PODFILE CHECKSUM: 1d3260c9c7c4e7959c1f82d6d23323008391b149

COCOAPODS: 1.2.1
COCOAPODS: 1.2.0
4 changes: 2 additions & 2 deletions ChattoApp/Pods/Local Podspecs/Chatto.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ChattoApp/Pods/Local Podspecs/ChattoAdditions.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions ChattoApp/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 27f82d9

Please sign in to comment.