Skip to content

Commit

Permalink
Merge pull request #36 from venmo/ep/carthageify
Browse files Browse the repository at this point in the history
Use a framework target instead of a static library
  • Loading branch information
dasmer committed Oct 29, 2015
2 parents dc6f7c5 + ffeaf8d commit 74bfc5d
Show file tree
Hide file tree
Showing 32 changed files with 920 additions and 649 deletions.
78 changes: 74 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,79 @@
Pods/
# Created by https://www.gitignore.io/api/objective-c

.DS_Store
*.pbxuser
### Objective-C ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata

## Other
*.xccheckout
VENCoreIntegrationTests/config.plist
*.moved-aside
*.xcuserstate
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa

# CocoaPods
#
# 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-check-the-pods-directory-into-source-control
#
Pods/

# Carthage
Carthage/Checkouts
Carthage/Build

### Objective-C Patch ###
*.xcscmblueprint

# Created by https://www.gitignore.io/api/osx

### OSX ###
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

*.gcno
*.gcda

VENCore.xcworkspace
Expand Down
1 change: 1 addition & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "calebd/CMDQueryStringSerialization" ~> 0.4
2 changes: 2 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "soffes/ISO8601" "v0.3.0"
github "calebd/CMDQueryStringSerialization" "v0.4.3"
63 changes: 35 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,59 +1,66 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.1)
activesupport (4.2.4)
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)
clamp (0.6.3)
cocoapods (0.37.2)
activesupport (>= 3.2.15)
claide (~> 0.8.1)
cocoapods-core (= 0.37.2)
cocoapods-downloader (~> 0.9.0)
claide (0.9.1)
clamp (0.6.5)
cocoapods (0.39.0)
activesupport (>= 4.0.2)
claide (~> 0.9.1)
cocoapods-core (= 0.39.0)
cocoapods-downloader (~> 0.9.3)
cocoapods-plugins (~> 0.4.2)
cocoapods-trunk (~> 0.6.1)
cocoapods-try (~> 0.4.5)
cocoapods-search (~> 0.1.0)
cocoapods-stats (~> 0.6.2)
cocoapods-trunk (~> 0.6.4)
cocoapods-try (~> 0.5.1)
colored (~> 1.2)
escape (~> 0.0.4)
molinillo (~> 0.2.3)
nap (~> 0.8)
xcodeproj (~> 0.24.2)
cocoapods-core (0.37.2)
activesupport (>= 3.2.15)
molinillo (~> 0.4.0)
nap (~> 1.0)
xcodeproj (~> 0.28.2)
cocoapods-core (0.39.0)
activesupport (>= 4.0.2)
fuzzy_match (~> 2.0.4)
nap (~> 0.8.0)
cocoapods-downloader (0.9.0)
nap (~> 1.0)
cocoapods-downloader (0.9.3)
cocoapods-plugins (0.4.2)
nap
cocoapods-trunk (0.6.1)
nap (>= 0.8)
cocoapods-search (0.1.0)
cocoapods-stats (0.6.2)
cocoapods-trunk (0.6.4)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (0.4.5)
cocoapods-try (0.5.1)
colored (1.2)
escape (0.0.4)
fuzzy_match (2.0.4)
i18n (0.7.0)
json (1.8.2)
minitest (5.7.0)
molinillo (0.2.3)
nap (0.8.0)
json (1.8.3)
minitest (5.8.2)
molinillo (0.4.0)
nap (1.0.0)
netrc (0.7.8)
plist (3.1.0)
rake (10.4.2)
slather (0.0.233)
rouge (1.10.1)
slather (1.3.0)
clamp (~> 0.6)
xcodeproj (~> 0.17)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (0.24.2)
xcodeproj (0.28.2)
activesupport (>= 3)
claide (~> 0.9.1)
colored (~> 1.2)
xcpretty (0.1.10)
xcpretty (0.2.1)
rouge (~> 1.8)

PLATFORMS
ruby
Expand All @@ -66,4 +73,4 @@ DEPENDENCIES
xcpretty

BUNDLED WITH
1.10.1
1.10.6
12 changes: 7 additions & 5 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '8.0'

inhibit_all_warnings!

target 'VENCore', :exclusive => true do
podspec
end
use_frameworks!

podspec

target 'VENCoreUnitTests', :exclusive => true do
pod 'Expecta'
pod 'Nocilla'
pod 'OCMock'
pod 'OCMock', '~> 2.2'
pod 'OCHamcrest'
pod 'Specta'
end

target 'VENCoreIntegrationTests', :exclusive => true do
pod 'Expecta'
pod 'Nocilla'
pod 'OCMock'
pod 'OCMock', '~> 2.2'
pod 'OCHamcrest'
pod 'Specta'
end
24 changes: 12 additions & 12 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
PODS:
- CMDQueryStringSerialization (0.4.0):
- CMDQueryStringSerialization (0.4.1):
- ISO8601
- Expecta (0.3.0)
- Expecta (1.0.3)
- ISO8601 (0.3.0)
- Nocilla (0.9.0)
- OCHamcrest (3.0.1)
- Nocilla (0.10.0)
- OCHamcrest (4.3.0)
- OCMock (2.2.4)
- Specta (0.2.1)
- Specta (1.0.4)

DEPENDENCIES:
- CMDQueryStringSerialization (~> 0.4)
- Expecta
- Nocilla
- OCHamcrest
- OCMock
- OCMock (~> 2.2)
- Specta

SPEC CHECKSUMS:
CMDQueryStringSerialization: 71bb5c0014147c55089964df23fd6e44316bd6f5
Expecta: 917bda2935b63ca7175741b8cf1b26796db6205f
CMDQueryStringSerialization: 4bb0a2f5e7d8d8678d911d88072274952cbef4e5
Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15
ISO8601: 8d8a22d5edf0554a1cf75bac028c76c1dc0ffaef
Nocilla: d7d96e8a11e363f0d7c976d48b320c43d61fb471
OCHamcrest: e19857683e4eefab64b878668eac04c2f4567118
Nocilla: ae0a2b05f3087b473624ac2b25903695df51246a
OCHamcrest: cd63d27f48a266d4412c0b295b01b8f0940efa81
OCMock: a6a7dc0e3997fb9f35d99f72528698ebf60d64f2
Specta: 15a276a6343867b426d5ed135d5aa4d04123a573
Specta: 69bb134672aae190a1379ff91df07dad8dd1f869

COCOAPODS: 0.37.2
COCOAPODS: 0.39.0
Loading

0 comments on commit 74bfc5d

Please sign in to comment.