diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0fe4504ef..86efabf23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,41 @@
+### 3.3.0 (March 10, 2018)
+
+#### Features
+- Added Swift 4 support #385 by [@AntonPalich](https://github.com/AntonPalich) and #345 by [@jpunz](https://github.com/jpunz)
+- Added messages selection #411 by [@AntonPalich](https://github.com/AntonPalich)
+- Added accessibility identifier to selection indicator #428 by [@AntonPalich](https://github.com/AntonPalich)
+- Added iCloud Library support to photos input #415 by [@Wisors](https://github.com/Wisors)
+- Added camera position settings for live camera cell #393 by [@Wisors](https://github.com/Wisors)
+- Allow client to set selected range of textView in ChatInputBar #402 by [@phatmann](https://github.com/phatmann)
+- Allow override of text message `text` #403 by [@phatmann](https://github.com/phatmann)
+- Added ability to change input bar placeholder #396 by [@chupakabr](https://github.com/chupakabr)
+- Allow to build TextMessagePresenter subclasses without exposing internal properties #421 by [@AntonPalich](https://github.com/AntonPalich)
+- Made UIScrollView delegates open in BaseChatViewController #438 by [@azimin](https://github.com/azimin)
+- Exposed keyboard position handling #445 by [@chupakabr](https://github.com/chupakabr)
+- Added additional state for keyboard tracker and ability to modify content insets #454 by [@azimin](https://github.com/azimin)
+- Removed Xcode 9 warnings #439 by [@irace](https://github.com/irace)
+
+#### Bugs
+- Fixed crashes that happened under some conditions in project with Swift 4 that used Chatto with Swift 3.2 #405, #414 by [@AntonPalich](https://github.com/AntonPalich)
+- Fixed issue with live camera cell when it wasnt updated after updating its appearance #404 by [@Wisors](https://github.com/Wisors)
+- Fixed issue with photo picker after migration to Swift 4 #437 by [@AntonPalich](https://github.com/AntonPalich)
+- Fixed crash that happened on devices with unaccessible camera caused by forced unwrapped optional #424 by [@Wisors](https://github.com/Wisors)
+- Removed gap under input bar on iPhone X #447 by [@azimin](https://github.com/azimin)
+- Fixed issue with wrong input bar position when hidesBottomBarWhenPushed is true on iPhone X #457 by [@AntonPalich](https://github.com/AntonPalich)
+
### 3.2.0 (October 20, 2017)
#### Features:
- - Added support for custom main view in BaseChatViewController #323 by @serge-star
- - Added ability to change input bar border color and width #339 by @NSEGeorge
- - Added ability to control visibility of failed icon #359 by @turbulem
- - Added Xcode 9 and iOS 11 support #352 by @AntonPalich
- - Added support for swiftlint 0.23 #371 by @AntonPalich
+ - Added support for custom main view in BaseChatViewController #323 by [@serge-star](https://github.com/serge-star)
+ - Added ability to change input bar border color and width #339 by [@NSEGeorge](https://github.com/NSEGeorge)
+ - Added ability to control visibility of failed icon #359 by [@turbulem](https://github.com/turbulem)
+ - Added Xcode 9 and iOS 11 support #352 by [@AntonPalich](https://github.com/AntonPalich)
+ - Added support for swiftlint 0.23 #371 by [@AntonPalich](https://github.com/AntonPalich)
+
#### Bugs:
- - Fixed crash caused by missing optionality identifier in UIKit #310 by @raisaanjani92
- - Fixed input container position when presenting chat as child controller #338 by @KaterinaPetrova
- - Fixed issue with gesture recognizers that wasn't disabled for text messages on iOS 11 #366 by @AntonPalich
+ - Fixed crash caused by missing optionality identifier in UIKit #310 by [@raisaanjani92](https://github.com/raisaanjani92)
+ - Fixed input container position when presenting chat as child controller #338 by [@KaterinaPetrova](https://github.com/KaterinaPetrova)
+ - Fixed issue with gesture recognizers that wasn't disabled for text messages on iOS 11 #366 by [@AntonPalich](https://github.com/AntonPalich)
### 3.1.0 (May 29, 2017)
diff --git a/Chatto.podspec b/Chatto.podspec
index 46401301f..5cfc6695c 100644
--- a/Chatto.podspec
+++ b/Chatto.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Chatto"
- s.version = "3.2.0"
+ s.version = "3.3.0"
s.summary = "Chat framework in Swift"
s.description = <<-DESC
Lightweight chat framework to build Chat apps
diff --git a/Chatto/Source/Info.plist b/Chatto/Source/Info.plist
index 340121d3f..f7c2d1b4c 100644
--- a/Chatto/Source/Info.plist
+++ b/Chatto/Source/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.2.0
+ 3.3.0
CFBundleSignature
????
CFBundleVersion
diff --git a/ChattoAdditions.podspec b/ChattoAdditions.podspec
index 9c039a3e5..371ed1a02 100644
--- a/ChattoAdditions.podspec
+++ b/ChattoAdditions.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ChattoAdditions"
- s.version = "3.2.0"
+ s.version = "3.3.0"
s.summary = "UI componentes for Chatto"
s.description = <<-DESC
Text and photo bubbles
diff --git a/ChattoAdditions/Source/Info.plist b/ChattoAdditions/Source/Info.plist
index 340121d3f..f7c2d1b4c 100644
--- a/ChattoAdditions/Source/Info.plist
+++ b/ChattoAdditions/Source/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 3.2.0
+ 3.3.0
CFBundleSignature
????
CFBundleVersion
diff --git a/README.md b/README.md
index ee84f4872..8c2fa60ae 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,11 @@ Check the [wiki!](https://github.com/badoo/Chatto/wiki)
1. Make sure `use_frameworks!` is added to your `Podfile`.
2. Include the following in your `Podfile`:
+ ```
+ # Swift 4
+ pod 'Chatto', '= 3.3.0'
+ pod 'ChattoAdditions', '= 3.3.0' # if you want to use the cells or the input component
+ ```
```
# Swift 3
pod 'Chatto', '= 3.2.0'
@@ -50,7 +55,7 @@ If you like living on the bleeding edge, you can use the `master` branch with:
If you’re using [Carthage](https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos), simply add Chatto to your Cartfile:
```
-# Swift 3
+# Swift 4
github "badoo/Chatto"
```
```