Skip to content

Commit c104a02

Browse files
authored
Merge pull request #5 from mpclarkson/swift-3.0
Swift 3.0
2 parents af0147e + ee6c0b2 commit c104a02

File tree

74 files changed

+7674
-5634
lines changed

Some content is hidden

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

74 files changed

+7674
-5634
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
language: objective-c
66
#cache: cocoapods
77
podfile: Example/Podfile
8-
osx_image: xcode7.3
8+
osx_image: xcode8
99
rvm:
1010
- 2.2
1111
before_install:
12-
- gem install cocoapods # Since Travis is not always on latest version
12+
- gem install cocoapods --pre # Since Travis is not always on latest version
1313
- pod repo update
1414
- pod install --project-directory=Example
1515
script:
16-
- set -o pipefail && xcodebuild test -workspace Example/StravaSwift.xcworkspace -scheme StravaSwift-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO | xcpretty
16+
- set -o pipefail && xcodebuild test -workspace Example/StravaSwift.xcworkspace -scheme StravaSwift-Example -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.0' | xcpretty
1717
- pod lib lint --allow-warnings

Example/.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

Example/Podfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- Alamofire (3.4.0)
3-
- StravaSwift (0.1.1):
4-
- Alamofire (~> 3.4)
5-
- SwiftyJSON (~> 2.3)
6-
- SwiftyJSON (2.3.2)
2+
- Alamofire (4.0.1)
3+
- StravaSwift (0.6.0):
4+
- Alamofire (~> 4)
5+
- SwiftyJSON (~> 3)
6+
- SwiftyJSON (3.1.0)
77

88
DEPENDENCIES:
99
- StravaSwift (from `../`)
@@ -13,10 +13,10 @@ EXTERNAL SOURCES:
1313
:path: "../"
1414

1515
SPEC CHECKSUMS:
16-
Alamofire: c19a627cefd6a95f840401c49ab1f124e07f54ee
17-
StravaSwift: cf8691d8eabc3d9e7171773010a02d57bc39eb0e
18-
SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a
16+
Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
17+
StravaSwift: a1ab66054e9b63cc0d9562c9f423a964e97ff747
18+
SwiftyJSON: 29b9f2a64f118c07e691667c2ba1efe536acfe0b
1919

2020
PODFILE CHECKSUM: 830d895e372f32b9cdc73b0fe3c991b3ee08e234
2121

22-
COCOAPODS: 1.0.0
22+
COCOAPODS: 1.1.0.rc.2

Example/Pods/Alamofire/README.md

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

0 commit comments

Comments
 (0)