MessageKit · SD10 · Dec 18, 2017 · Oct 25, 2017 · Oct 25, 2017 · Oct 25, 2017
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,4 @@ xcuserdata
 Pods/
 
 # Carthage
-# Carthage/Checkouts
-
-Carthage/Build
+Carthage
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,13 +1,16 @@
 
 disabled_rules:
-- identifier_name
-- trailing_whitespace
-- line_length
-- type_body_length
-- file_length
+  - identifier_name
+  - trailing_whitespace
+  - line_length
+  - type_body_length
+  - file_length
 custom_rules:
   override_func: # rule identifier
     name: "override in func" # rule name. optional.
     regex: "override (open|public|private|internal|fileprivate)" # matching pattern
     message: "Use like open override or public override instead" # violation message. optional.
     severity: warning # violation severity. optional.
+included:
+  - Sources
+  - Tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,62 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
 
 ## Upcoming release
 
+## [[Prerelease] 0.12.0](https://github.com/MessageKit/MessageKit/releases/tag/0.12.0)
+
+### Added
+
+- Added `reloadDataAndKeepOffset()` method to `MessagesCollectionView` to maintain the current position
+when reloading data.
+[#284](https://github.com/MessageKit/MessageKit/pull/284) by [@azurechen](https://github.com/azurechen).
+
+- Added `maintainPositionOnKeyboardFrameChanged: Bool` property to maintain the current position of the 
+`MessagesCollectionView` when the height of the `MessageInputBar` changes.
+[#340](https://github.com/MessageKit/MessageKit/pull/340) by [@KEN-chan](https://github.com/KEN-chan).
+
+- Added `detectorAttributes(for:and:at:)` method to `MessagesDisplayDelegate` allowing `DetectorType`
+attributes to be set outside of the cell.
+[#397](https://github.com/MessageKit/MessageKit/pull/397) by [@SD10](https://github.com/sd10).
+
+### Fixed
+
+- Fixed `indexPathForLastItem` bug when `numberOfSections` equal to 1. 
+[#395](https://github.com/MessageKit/MessageKit/issues/395) by [@zhongwuzw](https://github.com/zhongwuzw).
+
+- Fixed `scrollToBottom(animated:)` not work in some situations.
+[#395](https://github.com/MessageKit/MessageKit/issues/395) by [@zhongwuzw](https://github.com/zhongwuzw).
+
+- Fixed `.attributedText(NSAttributedString)` messages that were not using the `textColor` from the
+`MessagesDisplayDelegate` method.
+[#414](https://github.com/MessageKit/MessageKit/issues/414) by [@SD10](https://github.com/sd10).
+
+- Fixed a bug where new messages using `.attributedText(NSAttributedString)` have the incorrect font.
+[#412](https://github.com/MessageKit/MessageKit/issues/412) by [@SD10](https://github.com/sd10).
+
+
+### Changed
+
+- **Breaking Change** The `MessageLabel` properties `addressAttributes`, `dateAttributes`, `phoneNumberAttributes`,
+and `urlAttributes` are now read only. Please use `setAttributes(_:detector:)` to set these properties. 
+[#397](https://github.com/MessageKit/MessageKit/pull/397) by [@SD10](https://github.com/sd10).
+
+- **Breaking Change** Removed the generic constraint `<ContentView: UIView>` from `MessageCollectionViewCell`.
+[#391](https://github.com/MessageKit/MessageKit/pull/391) by [@SD10](https://github.com/sd10).
+
+- **Breaking Change** The `contentView` property has been renamed to `imageView` for `LocationMessageCell` and `MediaMessageCell`
+and `messageLabel` for `TextMessageCell`.
+[#391](https://github.com/MessageKit/MessageKit/pull/391) by [@SD10](https://github.com/sd10).
+
+- **Breaking Change** Changed the name of  `MessageInputBar`'s property `maxHeight` to `maxTextViewHeight` as the property is the max height the `InputTextView` can have, not the `MessageInputBar` itself.
+[#380](https://github.com/MessageKit/MessageKit/pull/380) by [@nathantannar4](https://github.com/nathantannar4).
+
+- **Breaking Change**  Adds a new view `contentView` of type `UIView` to the MessageInputBar to hold the main subviews of the `MessageInputBar`. Reduces complexity of constraints for easier testing/debugging.
+[#384](https://github.com/MessageKit/MessageKit/pull/384) by [@nathantannar4](https://github.com/nathantannar4).
+
+### Removed
+
+- **Breaking Change** Removed `scrollsToBottomOnFirstLayout` flag of `MessagesViewController`.
+[#395](https://github.com/MessageKit/MessageKit/pull/395) by [@zhongwuzw](https://github.com/zhongwuzw).
+
 ## [[Prerelease] 0.11.0](https://github.com/MessageKit/MessageKit/releases/tag/0.11.0)
 
 ### Added

diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1,2 @@
+github "Quick/Quick" ~> 1.2.0
+github "Quick/Nimble" ~> 7.0.3
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "Quick/Nimble" "v7.0.3"
+github "Quick/Quick" "v1.2.0"
diff --git a/Documentation/FAQs.md b/Documentation/FAQs.md
@@ -50,7 +50,7 @@ then get the `MessageType` for this cell through the `MessagesDataSource` method
 `messageForItem(at:IndexPath,in:MessagesCollectionView)`.
 
 ```Swift
-func didTapMessage<T>(in cell: MessageCollectionViewCell<T>) {
+func didTapMessage(in cell: MessageCollectionViewCell) {
     guard let indexPath = messagesCollectionView.indexPath(for: cell) else { return }
     guard let messagesDataSource = messagesCollectionView.messagesDataSource else { return }
     let message = messagesDataSource.messageForItem(at: indexPath, in: messagesCollectionView)

diff --git a/Example/Podfile b/Example/Podfile
@@ -2,14 +2,14 @@ platform :ios, '9.0'
 
 target 'ChatExample' do
   use_frameworks!
-  pod 'MessageKit', :path => '../MessageKit.podspec'
+  pod 'MessageKit', :path => '../'
 
-  target 'ChatExampleTests' do
-    inherit! :search_paths
-  end
+target 'ChatExampleTests' do
+  inherit! :search_paths
+end
 
-  target 'ChatExampleUITests' do
-    inherit! :search_paths
-  end
+target 'ChatExampleUITests' do
+  inherit! :search_paths
+end
 
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - MessageKit (0.10.2)
+  - MessageKit (0.11.0)
 
 DEPENDENCIES:
-  - MessageKit (from `../MessageKit.podspec`)
+  - MessageKit (from `../`)
 
 EXTERNAL SOURCES:
   MessageKit:
-    :path: ../MessageKit.podspec
+    :path: ../
 
 SPEC CHECKSUMS:
-  MessageKit: a1e8d0f1d7785891e4b37f6252898f23cd8f8b6a
+  MessageKit: 96caa3ba2c32f9393b406256c5caa29ae9189d71
 
-PODFILE CHECKSUM: 9ac65b8dedf0e1b63fea245b089b6645c4e66309
+PODFILE CHECKSUM: cecdb7bc8129cf99f66de9f68eea3256fec30c3d
 
 COCOAPODS: 1.3.1
diff --git a/Example/Sources/Assets.xcassets/ic_typing.imageset/Contents.json b/Example/Sources/Assets.xcassets/ic_typing.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-hand_with_pen.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Example/Sources/Assets.xcassets/ic_typing.imageset/icons8-hand_with_pen.png b/Example/Sources/Assets.xcassets/ic_typing.imageset/icons8-hand_with_pen.png
diff --git a/Example/Sources/Assets.xcassets/mklogo.imageset/Contents.json b/Example/Sources/Assets.xcassets/mklogo.imageset/Contents.json
@@ -2,11 +2,11 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "mklogo.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "mklogo.png",
       "scale" : "2x"
     },
     {

diff --git a/Example/Sources/Base.lproj/LaunchScreen.storyboard b/Example/Sources/Base.lproj/LaunchScreen.storyboard
@@ -6,7 +6,6 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -23,15 +22,17 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mklogo" translatesAutoresizingMaskIntoConstraints="NO" id="NHX-yN-7Jk">
-                                <rect key="frame" x="32" y="98" width="310" height="171"/>
+                                <rect key="frame" x="76" y="99" width="222" height="127"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="222" id="O7O-V2-Dmt"/>
+                                </constraints>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="0.24325716495513916" green="0.76319533586502075" blue="0.32751965522766113" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="NHX-yN-7Jk" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leadingMargin" constant="16" id="ak3-MI-1bZ"/>
+                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" relation="greaterThanOrEqual" secondItem="NHX-yN-7Jk" secondAttribute="bottom" id="1Ce-5w-nEL"/>
+                            <constraint firstItem="NHX-yN-7Jk" firstAttribute="top" secondItem="Llm-lL-Icb" secondAttribute="bottom" priority="750" constant="79" id="ReL-Hv-5uq"/>
                             <constraint firstItem="NHX-yN-7Jk" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="ebx-nK-jHq"/>
-                            <constraint firstItem="NHX-yN-7Jk" firstAttribute="top" secondItem="Llm-lL-Icb" secondAttribute="bottom" constant="78" id="mKL-l2-81o"/>
-                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="NHX-yN-7Jk" secondAttribute="bottom" constant="398" id="mjQ-GM-veo"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -41,6 +42,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="mklogo" width="888" height="255"/>
+        <image name="mklogo" width="444" height="127"/>
     </resources>
 </document>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github "Quick/Quick" ~> 1.2.0
		github "Quick/Nimble" ~> 7.0.3
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github "Quick/Nimble" "v7.0.3"
		github "Quick/Quick" "v1.2.0"