Skip to content

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Ochs committed May 18, 2015
2 parents f006455 + e2738a1 commit 0b50b97
Show file tree
Hide file tree
Showing 24 changed files with 1,150 additions and 1,342 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ language: objective-c
before_install:
- brew update # workaround for #2836
- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi # workaround for #2836
install:
- cd Example && bundle install && cd -
- cd Example && pod install && cd -
script:
- xctool test -workspace Example/HRSCustomErrorHandling.xcworkspace -scheme HRSCustomErrorHandling -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

The versioning in this project is based on [Semantic Versioning](http://semver.org).

## v0.3.0
Errors will now be queued to prevent several error messages from popping up at the same time. Also multiple error messages of the same type are coalesced and only displayed once.
## v0.2.0
Introduce a new api to present view controller based errors. This api is especially made for overriding and displaying custom error dialogs, such as [TSMessages](https://github.com/toursprung/TSMessages). The default implementation looks the same as the regular api but is only shown if the passed-in view controller is visible.

Expand Down
2 changes: 2 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ The project is available under the Apache 2 license. Please see the LICENSE file


## Contributors
### v0.3.0
- Roland Lindner - [Fix compiler error on uncasted objc_msgSend calls in Xcode 6.2](https://github.com/Hotel-Reservation-Service/HRSCustomErrorHandling/pull/6)

The list of contributors is updated with every new version tag that is added to the project.

Expand Down
3 changes: 3 additions & 0 deletions Example/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'cocoapods', '~> 0.36'
57 changes: 57 additions & 0 deletions Example/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.0)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (0.8.1)
cocoapods (0.36.0)
activesupport (>= 3.2.15)
claide (~> 0.8.1)
cocoapods-core (= 0.36.0)
cocoapods-downloader (~> 0.8.1)
cocoapods-plugins (~> 0.4.1)
cocoapods-trunk (~> 0.6.0)
cocoapods-try (~> 0.4.3)
colored (~> 1.2)
escape (~> 0.0.4)
molinillo (~> 0.2.1)
nap (~> 0.8)
open4 (~> 1.3)
xcodeproj (~> 0.23.0)
cocoapods-core (0.36.0)
activesupport (>= 3.2.15)
fuzzy_match (~> 2.0.4)
nap (~> 0.8.0)
cocoapods-downloader (0.8.1)
cocoapods-plugins (0.4.1)
nap
cocoapods-trunk (0.6.0)
nap (>= 0.8)
netrc (= 0.7.8)
cocoapods-try (0.4.3)
colored (1.2)
escape (0.0.4)
fuzzy_match (2.0.4)
i18n (0.7.0)
json (1.8.2)
minitest (5.5.1)
molinillo (0.2.1)
nap (0.8.0)
netrc (0.7.8)
open4 (1.3.4)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (0.23.0)
activesupport (>= 3)
colored (~> 1.2)

PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 0.36)
Loading

0 comments on commit 0b50b97

Please sign in to comment.