Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
normand1 committed Jun 19, 2015
2 parents 5f3dbdc + dae7a35 commit a88e7af
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 22 deletions.
15 changes: 6 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
# * https://github.com/supermarin/xcpretty#usage

language: objective-c
# cache: cocoapods
# podfile: Example/Podfile
# before_install:
# - gem install cocoapods # Since Travis is not always on latest version
# - pod install --project-directory=Example
install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
env:
- LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8
before_install:
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
- set -o pipefail && xcodebuild test -workspace Example/DNFlyingBadges.xcworkspace -scheme DNFlyingBadges-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty -c
- pod lib lint --quick
xcodebuild -workspace Example/DNFlyingBadges.xcworkspace -scheme DNFlyingBadges-Example -sdk iphonesimulator8.1 test
19 changes: 6 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# DNFlyingBadges

[![CI Status](http://img.shields.io/travis/David Norman/DNFlyingBadges.svg?style=flat)](https://travis-ci.org/David Norman/DNFlyingBadges)
[![Version](https://img.shields.io/cocoapods/v/DNFlyingBadges.svg?style=flat)](http://cocoapods.org/pods/DNFlyingBadges)
[![License](https://img.shields.io/cocoapods/l/DNFlyingBadges.svg?style=flat)](http://cocoapods.org/pods/DNFlyingBadges)
[![Platform](https://img.shields.io/cocoapods/p/DNFlyingBadges.svg?style=flat)](http://cocoapods.org/pods/DNFlyingBadges)

#### version 0.1 (beta)
_This is still beta quality code - feel free to test, create issues, etc. The library doesn't use any private APIs - apps using it should be fine for release on the App Store._

## Usage

To run the example project, clone the repo, and run `pod install` from the Example directory first.
Expand All @@ -20,18 +22,6 @@ it, simply add the following line to your Podfile:
pod "DNFlyingBadges"
```

## Author

David Norman, [email protected]

## License

DNFlyingBadges is available under the MIT license. See the LICENSE file for more info.

# DNFlyingBadges
#### version 0.1 (beta)
_This is still beta quality code - feel free to test, create issues, etc. The library doesn't use any private APIs - apps using it should be fine for release on the App Store._

<a name="intro"></a>
Intro
========
Expand Down Expand Up @@ -90,3 +80,6 @@ Includes [JNWSpringAnimation](https://github.com/jwilling/JNWSpringAnimation) by

Includes free icons from: [icomoon](https://icomoon.io/#home)

## License

DNFlyingBadges is available under the MIT license. See the LICENSE file for more info.

0 comments on commit a88e7af

Please sign in to comment.