Skip to content

Commit

Permalink
Merge pull request #9 from kingrocha/dev
Browse files Browse the repository at this point in the history
Carthage support
  • Loading branch information
rockbruno authored Aug 15, 2016
2 parents e8723d4 + 570467a commit 60e402e
Show file tree
Hide file tree
Showing 57 changed files with 827 additions and 1,681 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ DerivedData
# Bundler
.bundle

Carthage
Example/Carthage/
Example/Pods/
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
Expand All @@ -31,3 +32,7 @@ Carthage
# `pod install` in .travis.yml
#
# Pods/

Example/Cartfile.resolved

Example/Podfile.lock
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## 0.1.3
- Added Carthage support
* Change the internal file's structure for CocoaPods

## 0.1.2
- Initial release
* Added CocoaPods support
6 changes: 3 additions & 3 deletions ErrorKing.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'ErrorKing'
s.version = '0.1.2'
s.version = '0.1.3'
s.summary = 'Swift Lib to make displaying errors and emptyState screens a very easy task'

# This description is used to generate tags and improve search results.
Expand All @@ -30,10 +30,10 @@ TODO: Add long description of the pod here.

s.ios.deployment_target = '8.0'

s.source_files = 'ErrorKing/Classes/**/*'
s.source_files = 'Sources/Classes/**/*'

s.resource_bundles = {
'ErrorKing' => ['ErrorKing/Assets/EKAssets.xcassets']
'ErrorKing' => ['Sources/Assets/EKAssets.xcassets']
}

# s.public_header_files = 'Pod/Classes/**/*.h'
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 60e402e

Please sign in to comment.