Merge branch 'development' of https://github.com/MessageKit/MessageKit …

…into tagonsoft_development # Conflicts: # CHANGELOG.md
dodubaby · Nov 16, 2018 · 8130c6e · 8130c6e
2 parents cda8276 + 4b14db1
commit 8130c6e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 837 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
   build-and-test:
 
     environment:
-      - DESTINATION: "platform=iOS Simulator,name=iPhone XR"
+      - DESTINATION: "platform=iOS Simulator,name=iPhone XS"
 
     # Specify the Xcode version to use.
     macos:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,17 +4,18 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
 
 --------------------------------------
 
-=======
+
 ## Upcoming Release
 
+- **Breaking Change**  Add support for audio messages [#892](https://github.com/MessageKit/MessageKit/pull/892) by [@moldovaniosif](https://github.com/moldovaniosif).  Added new protocols `AudioControllerDelegate`, `AudioItem` a new cell  `AudioMessageCell` and a new controller `BasicAudioController`. 
+
+## [2.0.0](https://github.com/MessageKit/MessageKit/releases/tag/2.0.0)
+
 ### Changed
 
 - Change acl of `handleGesture(touchLocation:)` in `MessageLabel` from internal to open. 
 [#912](https://github.com/MessageKit/MessageKit/pull/912) by [@julienkode](https://github.com/JulienKode)
 
-- **Breaking Change**  Add support for audio messages [#892](https://github.com/MessageKit/MessageKit/pull/892) by [@moldovaniosif](https://github.com/moldovaniosif).  Added new protocols `AudioControllerDelegate`, `AudioItem` a new cell  `AudioMessageCell` and a new controller `BasicAudioController`. 
-
-
 ## [2.0.0-beta.1](https://github.com/MessageKit/MessageKit/releases/tag/2.0.0-beta.1)
 
 ### Changed

diff --git a/MessageKit.podspec b/MessageKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = 'MessageKit'
-   s.version = '2.0.0-beta.1'
+   s.version = '2.0.0'
    s.license = { :type => "MIT", :file => "LICENSE.md" }
 
    s.summary = 'An elegant messages UI library for iOS.'