Skip to content

Commit 336daff

Browse files
darkcldarkcl
committed
+ Add carthage support
1 parent 93223ae commit 336daff

File tree

620 files changed

+78778
-8471
lines changed

Some content is hidden

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

620 files changed

+78778
-8471
lines changed

‎.gitignore

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
# OS X
2-
.DS_Store
31

2+
# Created by https://www.gitignore.io/api/xcode
3+
4+
### Xcode ###
45
# Xcode
6+
#
7+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
8+
9+
## Build generated
510
build/
11+
DerivedData/
12+
13+
## Various settings
614
*.pbxuser
715
!default.pbxuser
816
*.mode1v3
@@ -11,23 +19,9 @@ build/
1119
!default.mode2v3
1220
*.perspectivev3
1321
!default.perspectivev3
14-
xcuserdata
15-
*.xccheckout
16-
profile
17-
*.moved-aside
18-
DerivedData
19-
*.hmap
20-
*.ipa
21-
22-
# Bundler
23-
.bundle
22+
xcuserdata/
2423

25-
Carthage
26-
# We recommend against adding the Pods directory to your .gitignore. However
27-
# you should judge for yourself, the pros and cons are mentioned at:
28-
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
29-
#
30-
# Note: if you ignore the Pods directory, make sure to uncomment
31-
# `pod install` in .travis.yml
32-
#
33-
# Pods/
24+
## Other
25+
*.moved-aside
26+
*.xccheckout
27+
*.xcscmblueprint

‎.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
# * https://github.com/supermarin/xcpretty#usage
44

55
language: objective-c
6-
osx_image: xcode7.2
6+
osx_image: xcode7.3
77
cache: cocoapods
88
rvm: 2.2.2
99
podfile: Example/Podfile
1010
before_install:
1111
- gem install cocoapods # Since Travis is not always on latest version
1212
- pod install --project-directory=Example
1313
script:
14-
- xctool -workspace Example/PokemonKit.xcworkspace -scheme PokemonKit-Example test -sdk iphonesimulator
14+
# - xctool -project PokemonKit.xcodeproj -scheme "PokemonKit iOS" test -sdk iphonesimulator
15+
# - xctool -project PokemonKit.xcodeproj -scheme "PokemonKit OSX" test -sdk macosx
16+
# - xctool -project PokemonKit.xcodeproj -scheme "PokemonKit tvOS" test -sdk appletvsimulator
1517
- pod lib lint --allow-warnings

‎Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "tristanhimmelman/AlamofireObjectMapper" ~> 3.0

‎Cartfile.resolved

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
github "Alamofire/Alamofire" "3.4.1"
2+
github "Hearst-DD/ObjectMapper" "1.4.0"
3+
github "tristanhimmelman/AlamofireObjectMapper" "3.0.2"

‎Carthage/Checkouts/Alamofire/.gitignore

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Mac OS X
2+
.DS_Store
3+
4+
# Xcode
5+
6+
## Build generated
7+
build/
8+
DerivedData
9+
10+
## Various settings
11+
*.pbxuser
12+
!default.pbxuser
13+
*.mode1v3
14+
!default.mode1v3
15+
*.mode2v3
16+
!default.mode2v3
17+
*.perspectivev3
18+
!default.perspectivev3
19+
xcuserdata
20+
21+
## Other
22+
*.xccheckout
23+
*.moved-aside
24+
*.xcuserstate
25+
*.xcscmblueprint
26+
27+
## Obj-C/Swift specific
28+
*.hmap
29+
*.ipa
30+
31+
## Playgrounds
32+
timeline.xctimeline
33+
playground.xcworkspace
34+
35+
# Swift Package Manager
36+
.build/
37+
38+
# Carthage
39+
Carthage/Build

‎Carthage/Checkouts/Alamofire/.travis.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
language: objective-c
2+
osx_image: xcode7.3
3+
env:
4+
global:
5+
- LC_CTYPE=en_US.UTF-8
6+
- LANG=en_US.UTF-8
7+
- WORKSPACE=Alamofire.xcworkspace
8+
- IOS_FRAMEWORK_SCHEME="Alamofire iOS"
9+
- OSX_FRAMEWORK_SCHEME="Alamofire OSX"
10+
- TVOS_FRAMEWORK_SCHEME="Alamofire tvOS"
11+
- WATCHOS_FRAMEWORK_SCHEME="Alamofire watchOS"
12+
- IOS_SDK=iphonesimulator9.3
13+
- OSX_SDK=macosx10.11
14+
- TVOS_SDK=appletvsimulator9.2
15+
- WATCHOS_SDK=watchsimulator2.2
16+
- EXAMPLE_SCHEME="iOS Example"
17+
matrix:
18+
- DESTINATION="OS=8.1,name=iPhone 4S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
19+
- DESTINATION="OS=8.2,name=iPhone 5" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
20+
- DESTINATION="OS=8.3,name=iPhone 5S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
21+
- DESTINATION="OS=8.4,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
22+
- DESTINATION="OS=9.0,name=iPhone 6" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
23+
- DESTINATION="OS=9.1,name=iPhone 6 Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
24+
- DESTINATION="OS=9.2,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
25+
- DESTINATION="OS=9.3,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"
26+
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$OSX_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
27+
- DESTINATION="OS=9.2,name=Apple TV 1080p" SCHEME="$TVOS_FRAMEWORK_SCHEME" SDK="$TVOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
28+
- DESTINATION="OS=2.2,name=Apple Watch - 42mm" SCHEME="$WATCHOS_FRAMEWORK_SCHEME" SDK="$WATCHOS_SDK" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"
29+
script:
30+
- set -o pipefail
31+
- xcodebuild -version
32+
- xcodebuild -showsdks
33+
34+
# Build Framework in Debug and Run Tests if specified
35+
- if [ $RUN_TESTS == "YES" ]; then
36+
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
37+
else
38+
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
39+
fi
40+
41+
# Build Framework in Release and Run Tests if specified
42+
- if [ $RUN_TESTS == "YES" ]; then
43+
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
44+
else
45+
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
46+
fi
47+
48+
# Build Example in Debug if specified
49+
- if [ $BUILD_EXAMPLE == "YES" ]; then
50+
xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
51+
fi
52+
53+
# Run `pod lib lint` if specified
54+
- if [ $POD_LINT == "YES" ]; then
55+
pod lib lint;
56+
fi

‎Carthage/Checkouts/Alamofire/Alamofire.podspec

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Pod::Spec.new do |s|
2+
s.name = 'Alamofire'
3+
s.version = '3.4.1'
4+
s.license = 'MIT'
5+
s.summary = 'Elegant HTTP Networking in Swift'
6+
s.homepage = 'https://github.com/Alamofire/Alamofire'
7+
s.social_media_url = 'http://twitter.com/AlamofireSF'
8+
s.authors = { 'Alamofire Software Foundation' => 'info@alamofire.org' }
9+
s.source = { :git => 'https://github.com/Alamofire/Alamofire.git', :tag => s.version }
10+
11+
s.ios.deployment_target = '8.0'
12+
s.osx.deployment_target = '10.9'
13+
s.tvos.deployment_target = '9.0'
14+
s.watchos.deployment_target = '2.0'
15+
16+
s.source_files = 'Source/*.swift'
17+
end

0 commit comments

Comments
 (0)