Merge pull request #19 from diegosanchezr/master

Run ChattoApp tests and bump to Xcode 7.2

.travis.yml

@@ -1,11 +1,11 @@
 language: objective-c
-osx_image: xcode7.1
+osx_image: xcode7.2
 
 script:
-- xcodebuild clean build test -workspace ./Chatto.xcworkspace -scheme Chatto -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.1' -configuration Debug | xcpretty
+- xcodebuild clean build test -workspace ./ChattoApp/ChattoApp.xcworkspace -scheme ChattoApp -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.2' -configuration Debug | xcpretty
 - rm -rf ~/Library/Developer/Xcode/DerivedData
-- xcodebuild clean build test -workspace ./Chatto.xcworkspace -scheme Chatto -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.1' -configuration Debug | xcpretty
+- xcodebuild clean build test -workspace ./Chatto.xcworkspace -scheme Chatto -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.2' -configuration Debug | xcpretty
 - (curl -s https://codecov.io/bash) | bash
 - rm -rf ~/Library/Developer/Xcode/DerivedData
-- xcodebuild clean build test -workspace ./Chatto.xcworkspace -scheme ChattoAdditions -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.1' -configuration Debug | xcpretty
+- xcodebuild clean build test -workspace ./Chatto.xcworkspace -scheme ChattoAdditions -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.2' -configuration Debug | xcpretty
 - (curl -s https://codecov.io/bash) | bash

README.md

@@ -139,19 +139,19 @@ If you like to live on the bleeding edge, you can use the `master` branch with:
     ```
 3. Run `pod install`
 
-### Manually
-
-1. Clone, add as a submodule or [download.](https://github.com/badoo/Chatto/archive/master.zip)
-2. Drag and drop `Chatto` and/or `ChattoAdditions` project to your workspace
-3. Add `Chatto` and/or `ChattoAdditions` to Embedded binaries
-
 ### Carthage
 
-Or, if you’re using [Carthage](https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos), simply add Chatto to your Cartfile:
+If you’re using [Carthage](https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos), simply add Chatto to your Cartfile:
 ```
 github "badoo/Chatto"
 ```
 
+### Manually
+
+1. Clone, add as a submodule or [download.](https://github.com/badoo/Chatto/archive/master.zip)
+2. Drag and drop `Chatto` and/or `ChattoAdditions` project to your workspace
+3. Add `Chatto` and/or `ChattoAdditions` to Embedded binaries
+
 ## License
 Source code is distributed under MIT license.