Merge branch 'release/0.9.4'

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
 before_install:
-- cd Demo
+- cd Demo/Objective-C
 script:
 - xctool -project Demo.xcodeproj -scheme Demo -sdk iphonesimulator

CHTCollectionViewWaterfallLayout.podspec

@@ -1,23 +1,26 @@
 Pod::Spec.new do |s|
   s.name         = "CHTCollectionViewWaterfallLayout"
-  s.version      = "0.9.2"
+  s.version      = "0.9.4"
   s.summary      = "The waterfall (i.e., Pinterest-like) layout for UICollectionView."
   s.homepage     = "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout"
   s.screenshots  = "https://raw.github.com/chiahsien/UICollectionViewWaterfallLayout/master/Screenshots/2-columns.png"
   s.license      = 'MIT'
   s.author       = { "Nelson" => "[email protected]" }
   s.source       = { :git => "https://github.com/chiahsien/CHTCollectionViewWaterfallLayout.git", :tag => "#{s.version}" }
+  s.requires_arc = true
+
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
-  s.requires_arc = true
 
   s.default_subspec = 'ObjC'
 
   s.subspec 'ObjC' do |ss|
-      ss.source_files = '*.{h,m}'
+    ss.ios.deployment_target = '6.0'
+    ss.source_files = '*.{h,m}'
   end
 
   s.subspec 'Swift' do |ss|
-      ss.source_files = '*.swift'
+    ss.ios.deployment_target = '8.0'
+    ss.source_files = '*.swift'
   end
 end

README.md

@@ -15,7 +15,7 @@ Screen Shots
 
 Features
 --------
-* Easy to use, it trys to imitate [UICollectionViewFlowLayout]'s usage as much as possible.
+* Easy to use, it tries to imitate [UICollectionViewFlowLayout]'s usage as much as possible.
 * Highly customizable.
 * Outstanding performance, try 10,000+ items and see the smoothness for yourself.
 * Support header and footer views.
@@ -31,16 +31,17 @@ Prerequisite
 How to install
 --------------
 * [CocoaPods]  
-  Add `pod 'CHTCollectionViewWaterfallLayout'` to your podfile.
+  - Add `pod 'CHTCollectionViewWaterfallLayout'` to your Podfile.
+  - If you prefer Swift, `pod 'CHTCollectionViewWaterfallLayout/Swift'` is ready for you.
 * Manual  
-  Copy `CHTCollectionViewWaterfallLayout.h/m` to your project.
+  - Copy `CHTCollectionViewWaterfallLayout.h/m` or `CHTCollectionViewWaterfallLayout.swift` to your project.
 
 How to Use
 ----------
 Read the demo codes and `CHTCollectionViewWaterfallLayout.h` header file for more information.
 
 #### Step 1
-Below lists the properties for you to customize the layout. Although they have default values, I strongly recommand you to set up at least the `columnCount` property to suit your needs.
+Below lists the properties for you to customize the layout. Although they have default values, I strongly recommend you to set up at least the `columnCount` property to suit your needs.
 The `itemRenderDirection` property is an enum which decides the order in which your items will be rendered in subsequent rows. For eg. Left-Right | Right-Left | Shortest column filling up first.
 
 ``` objc
@@ -104,4 +105,3 @@ Refer to the [Releases page](https://github.com/chiahsien/CHTCollectionViewWater
 [Pinterest]: http://pinterest.com/
 [PSTCollectionView]: https://github.com/steipete/PSTCollectionView
 [CocoaPods]: http://cocoapods.org/
-