From b00baad29de73e63fd2a8dbe09adb5eb91841cee Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Thu, 7 Jan 2016 09:54:27 -0800 Subject: [PATCH 1/3] Add installation via Carthage instructions to README. --- README.md | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d8520af9e..4ab785173 100644 --- a/README.md +++ b/README.md @@ -20,15 +20,24 @@ And you're off! Take a look at the public [documentation][docs] and start buildi **Other Installation Options** - 1. **CocoaPods** - - Add the following line to your podfile: - - pod 'Parse' - - Run pod install, and you should now have the latest parse release. - - 2. **Compiling for yourself** + - **[CocoaPods](https://cocoapods.org)** + + Add the following line to your Podfile: + ```ruby + pod 'Parse' + ``` + Run `pod install`, and you should now have the latest parse release. + + + - **[Carthage](https://github.com/carthage/carthage)** + + Add the following line to your Cartfile: + ``` + github "ParsePlatform/Parse-SDK-iOS-OSX" + ``` + Run `carthage update`, and you should now have the latest version of Parse SDK in your Carthage folder. + + - **Compiling for yourself** If you want to manually compile the SDK, clone it locally, and run the following commands in the root directory of the repository: @@ -43,7 +52,7 @@ And you're off! Take a look at the public [documentation][docs] and start buildi Compiled frameworks will be in 2 archives: `Parse-iOS.zip` and `Parse-OSX.zip` inside the `build/release` folder, and you can link them as you'd please. - 3. **Using Parse as a sub-project** + - **Using Parse as a sub-project** You can also include parse as a subproject inside of your application if you'd prefer, although we do not recommend this, as it will increase your indexing time significantly. To do so, just drag and drop the Parse.xcodeproj file into your workspace. Note that unit tests will be unavailable if you use Parse like this, as OCMock will be unable to be found. From 627a9296655ca63c1de94bd21d96cffcfa68fe22 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Thu, 7 Jan 2016 09:56:38 -0800 Subject: [PATCH 2/3] Add Carthage badge to README. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4ab785173..ab2e8d8a6 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Build Status][build-status-svg]][build-status-link] [![Coverage Status][coverage-status-svg]][coverage-status-link] [![Podspec][podspec-svg]][podspec-link] +[![Carthage compatible][carthage-svg]](carthage-link) [![License][license-svg]][license-link] ![Platforms][platforms-svg] [![Dependencies][dependencies-svg]][dependencies-link] @@ -109,6 +110,9 @@ of patent rights can be found in the PATENTS file in the same directory. [podspec-svg]: https://img.shields.io/cocoapods/v/Parse.svg [podspec-link]: https://cocoapods.org/pods/Parse + + [carthage-svg]: https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat + [carthage-link]: https://github.com/carthage/carthage [platforms-svg]: http://img.shields.io/cocoapods/p/Parse.svg?style=flat From e4e24a262306f0cfd311c4776b8a9b78a253f1a2 Mon Sep 17 00:00:00 2001 From: Nikita Lutsenko Date: Thu, 7 Jan 2016 09:58:35 -0800 Subject: [PATCH 3/3] Split badges in README. --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ab2e8d8a6..e29e488a8 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ # Parse SDK for iOS/OS X/watchOS/tvOS -[![Build Status][build-status-svg]][build-status-link] -[![Coverage Status][coverage-status-svg]][coverage-status-link] +![Platforms][platforms-svg] +[![License][license-svg]][license-link] + [![Podspec][podspec-svg]][podspec-link] [![Carthage compatible][carthage-svg]](carthage-link) -[![License][license-svg]][license-link] -![Platforms][platforms-svg] [![Dependencies][dependencies-svg]][dependencies-link] [![References][references-svg]][references-link] +[![Build Status][build-status-svg]][build-status-link] +[![Coverage Status][coverage-status-svg]][coverage-status-link] + [![Join Chat][gitter-svg]][gitter-link] A library that gives you access to the powerful Parse cloud platform from your iOS or OS X app.