Skip to content

Commit a6eda60

Browse files
committed
Merge pull request #47 from andreamazz/master
Add Carthage support
2 parents db58c1e + 2659227 commit a6eda60

File tree

109 files changed

+8434
-2762
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+8434
-2762
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ DerivedData
3030
# `pod install` in .travis.yml
3131
#
3232
# Pods/
33+
34+
# Carthage
35+
Carthage/Build

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22
# * http://www.objc.io/issue-6/travis-ci.html
33
# * https://github.com/supermarin/xcpretty#usage
44

5+
osx_image: xcode7.3
56
language: objective-c
7+
sudo: required
8+
before_install:
9+
- export LANG=en_US.UTF-8
10+
- gem install xcpretty --no-ri --no-rdoc
611
# cache: cocoapods
712
# podfile: Example/Podfile
813
# before_install:
914
# - gem install cocoapods # Since Travis is not always on latest version
1015
# - pod install --project-directory=Example
1116
script:
12-
- xctool -workspace Example/FDWaveformView.xcworkspace -scheme FDWaveformView-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO clean build test
17+
- xcodebuild -workspace Example/FDWaveformView.xcworkspace -scheme FDWaveformView-Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.3' clean build test | xcpretty --test --color
1318
- pod lib lint --quick

Example/FDWaveformView.xcodeproj/project.pbxproj

Lines changed: 1467 additions & 621 deletions
Large diffs are not rendered by default.

Example/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ target 'Tests', :exclusive => true do
99

1010
pod 'Specta'
1111
pod 'Expecta'
12-
pod 'FBSnapshotTestCase'
12+
pod 'FBSnapshotTestCase', '1.5'
1313
pod 'Expecta+Snapshots'
1414
end

Example/Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
PODS:
2-
- Expecta (0.3.2)
2+
- Expecta (1.0.5)
33
- Expecta+Snapshots (1.3.1):
44
- Expecta
55
- FBSnapshotTestCase
66
- FBSnapshotTestCase (1.5)
7-
- FDWaveformView (0.1.0)
8-
- Specta (0.4.0)
7+
- FDWaveformView (0.3.1)
8+
- Specta (1.0.5)
99

1010
DEPENDENCIES:
1111
- Expecta
1212
- Expecta+Snapshots
13-
- FBSnapshotTestCase
13+
- FBSnapshotTestCase (= 1.5)
1414
- FDWaveformView (from `../`)
1515
- Specta
1616

1717
EXTERNAL SOURCES:
1818
FDWaveformView:
19-
:path: ../
19+
:path: "../"
2020

2121
SPEC CHECKSUMS:
22-
Expecta: ee641011fe10aa1855d487b40e4976dac50ec342
23-
Expecta+Snapshots: 4a56b9411c6ed156987072e52c39de67d864015a
24-
FBSnapshotTestCase: e2914fbaabccea1dcc773d6a16b1c24540642488
25-
FDWaveformView: 0a0a776425617058fb6764959e19ebf69775d74a
26-
Specta: 1df326d6ec48603c77f507a0ab1f89ad2df1c582
22+
Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
23+
Expecta+Snapshots: 4a0b46d3ba755bd43dffa7d53e4585fc6cbfe8cd
24+
FBSnapshotTestCase: 26f32d8fa9eb30e9f09712ecfb097808bc79b898
25+
FDWaveformView: dc3de96ec4b78db542690dd103e98ed8e40f2163
26+
Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
2727

28-
COCOAPODS: 0.36.0
28+
COCOAPODS: 0.39.0

Example/Pods/Expecta/Expecta/EXPDoubleTuple.m

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Expecta/Expecta/EXPExpect.m

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Expecta/Expecta/EXPFloatTuple.m

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Expecta/Expecta/EXPUnsupportedObject.m

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Expecta/Expecta/Expecta.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)