Skip to content

Commit

Permalink
Merge pull request #319 from badoo/release_3.1.0
Browse files Browse the repository at this point in the history
Release 3.1.0
  • Loading branch information
AntonPalich authored May 29, 2017
2 parents 7296847 + d25aa78 commit 6c5c559
Show file tree
Hide file tree
Showing 26 changed files with 223 additions and 134 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.1.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode8.1
osx_image: xcode8.3

script:
- set -o pipefail
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
### 3.1.0 (May 29, 2017)

* swiftlint 0.13 support & Xcode 8.2 compatibility [#253](https://github.com/badoo/Chatto/pull/253) - [@diegosanchezr](https://github.com/diegosanchezr)
* swiftlint 0.14 support & hashes improvements [#271](https://github.com/badoo/Chatto/pull/271) - [@diegosanchezr](https://github.com/diegosanchezr)
* Removed lazy keyword from accessoryTimestampView property in BaseMessageCollectionViewCell [#286](https://github.com/badoo/Chatto/pull/286) - [@geegaset](https://github.com/geegaset)
* Fixed typo in a comment in BaseChatViewController+Changes.swift [#296](https://github.com/badoo/Chatto/pull/296) - [@NickAger](https://github.com/NickAger)
* BasicChatInputBarPresenter.chatInputBar became public [#297](https://github.com/badoo/Chatto/pull/297) - [@NickAger](https://github.com/NickAger)
* Added ability to specify tint color for text input [#301](https://github.com/badoo/Chatto/pull/301) - [@V0idPRO](https://github.com/V0idPRO)
* Xcode 8.3 compatibility [#300](https://github.com/badoo/Chatto/pull/300) - [@geegaset](https://github.com/geegaset)
* Empty layout model is returned if layout delegate is nil [#304](https://github.com/badoo/Chatto/pull/304) - [@chupakabr](https://github.com/chupakabr)

### 3.0.1 (Nov 14, 2016)
* Swift 3.0.1 / Xcode 8.1 support [#233](https://github.com/badoo/Chatto/pull/233) - [@diegosanchezr](https://github.com/diegosanchezr)
* Fixes weird linker issue with Carthage [#232](https://github.com/badoo/Chatto/pull/232) - [@zwang](https://github.com/zwang)
Expand Down
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.0.1"
s.version = "3.1.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.0.1</string>
<string>3.1.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.0.1"
s.version = "3.1.0"
s.summary = "UI componentes for Chatto"
s.description = <<-DESC
Text and photo bubbles
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.0.1</string>
<string>3.1.1</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_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";
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";
showEnvVarsInLog = 0;
};
F8D7533B1E7B2E137B143EBD /* [CP] Copy Pods Resources */ = {
Expand Down
10 changes: 5 additions & 5 deletions ChattoApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PODS:
- Chatto (3.0.1)
- ChattoAdditions (3.0.1):
- Chatto (3.1.0)
- ChattoAdditions (3.1.0):
- Chatto

DEPENDENCIES:
Expand All @@ -14,9 +14,9 @@ EXTERNAL SOURCES:
:path: ".."

SPEC CHECKSUMS:
Chatto: 760a1577da85ce75821fc5a4ecdd89c17fab2cd7
ChattoAdditions: e44d3aaf236af16735c58c711d289250d4bc85f7
Chatto: dc39056aed56fcababb857affd8152606afb2b5a
ChattoAdditions: 4f54c932c08488fca0a85f211094276f03f4ee60

PODFILE CHECKSUM: 1d3260c9c7c4e7959c1f82d6d23323008391b149

COCOAPODS: 1.1.1
COCOAPODS: 1.2.1
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.

10 changes: 5 additions & 5 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 6c5c559

Please sign in to comment.