Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Xcode 7.3 #5

Merged
merged 1 commit into from
Mar 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ DerivedData

# AppCode
.idea
fastlane/README.md
fastlane/test-output
fastlane/report.xml

.DS_Store
Pods/
Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.1
osx_image: xcode7.3
sudo: false
env:
global:
Expand All @@ -8,13 +8,13 @@ env:
- FASTLANE_LANE=ci_commit
matrix:
include:
- osx_image: xcode7.2
- osx_image: xcode7.3
env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default
- osx_image: xcode7.2
env: FASTLANE_ENV=ios92
- osx_image: xcode7.2
env: FASTLANE_ENV=tvos91
- osx_image: xcode7.2
- osx_image: xcode7.3
env: FASTLANE_ENV=ios93
- osx_image: xcode7.3
env: FASTLANE_ENV=tvos92
- osx_image: xcode7.3
env: FASTLANE_ENV=osx
before_install:
- make install
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "nerdishbynature/RequestKit" ~> 0.2.2
github "nerdishbynature/RequestKit" ~> 0.3.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "nerdishbynature/Nocilla" "57161f3454bebebf111e3e3b2a0b9cb300e2d0ac"
github "nerdishbynature/RequestKit" "0.2.2"
github "nerdishbynature/RequestKit" "0.3.0"
102 changes: 46 additions & 56 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.5.1)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.3.8)
babosa (1.0.2)
cert (1.3.0)
cert (1.4.0)
fastlane_core (>= 0.29.1, < 1.0.0)
spaceship (>= 0.16.0, < 1.0.0)
spaceship (>= 0.22.0, < 1.0.0)
claide (0.9.1)
clamp (0.6.5)
cocoapods (0.39.0)
Expand Down Expand Up @@ -42,7 +42,6 @@ GEM
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (0.5.1)
coderay (1.1.1)
colored (1.2)
commander (4.3.5)
highline (~> 1.7.2)
Expand All @@ -51,13 +50,13 @@ GEM
commander (>= 4.3.5)
highline (>= 1.7.1)
security
deliver (1.10.3)
deliver (1.10.5)
credentials_manager (>= 0.12.0, < 1.0.0)
fastimage (~> 1.6)
fastlane_core (>= 0.36.4, < 1.0.0)
fastlane_core (>= 0.37.0, < 1.0.0)
plist (~> 3.1.0)
spaceship (>= 0.19.0, <= 1.0.0)
domain_name (0.5.20160128)
spaceship (>= 0.19.0, < 1.0.0)
domain_name (0.5.20160310)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.1.0)
escape (0.0.4)
Expand All @@ -71,32 +70,32 @@ GEM
faraday (>= 0.7.4, < 0.10)
fastimage (1.6.8)
addressable (~> 2.3, >= 2.3.5)
fastlane (1.61.0)
fastlane (1.68.0)
addressable (~> 2.3.8)
cert (>= 1.3.0, < 2.0.0)
cert (>= 1.4.0, < 2.0.0)
credentials_manager (>= 0.15.0, < 1.0.0)
deliver (>= 1.10.1, < 2.0.0)
fastlane_core (>= 0.36.5, < 1.0.0)
frameit (>= 2.4.1, < 3.0.0)
gym (>= 1.6.1, < 2.0.0)
deliver (>= 1.10.5, < 2.0.0)
fastlane_core (>= 0.37.0, < 1.0.0)
frameit (>= 2.5.1, < 3.0.0)
gym (>= 1.6.2, < 2.0.0)
krausefx-shenzhen (>= 0.14.7)
match (>= 0.3.0, < 1.0.0)
pem (>= 1.2.0, < 2.0.0)
pilot (>= 1.3.0, < 2.0.0)
match (>= 0.4.0, < 1.0.0)
pem (>= 1.3.0, < 2.0.0)
pilot (>= 1.4.1, < 2.0.0)
plist (~> 3.1.0)
produce (>= 1.1.0, < 2.0.0)
scan (>= 0.5.0, < 1.0.0)
screengrab (>= 0.2.0, < 1.0.0)
sigh (>= 1.3.1, < 2.0.0)
produce (>= 1.1.1, < 2.0.0)
scan (>= 0.5.2, < 1.0.0)
screengrab (>= 0.3.1, < 1.0.0)
sigh (>= 1.6.0, < 2.0.0)
slack-notifier (~> 1.3)
snapshot (>= 1.7.0, < 2.0.0)
spaceship (>= 0.19.4, < 1.0.0)
snapshot (>= 1.12.0, < 2.0.0)
spaceship (>= 0.24.0, < 1.0.0)
supply (>= 0.4.0, < 1.0.0)
terminal-notifier (~> 1.6.2)
terminal-table (~> 1.4.5)
xcodeproj (>= 0.20, < 1.0.0)
xcodeproj (>= 0.20, < 2.0.0)
xcpretty (>= 0.2.1)
fastlane_core (0.36.6)
fastlane_core (0.39.0)
babosa
colored
commander (= 4.3.5)
Expand All @@ -109,21 +108,19 @@ GEM
rubyzip (~> 1.1.6)
sentry-raven (~> 0.15)
terminal-table (~> 1.4.5)
frameit (2.4.1)
frameit (2.5.1)
deliver (> 0.3)
fastimage (~> 1.6.3)
fastlane_core (>= 0.16.0, < 1.0.0)
fastlane_core (>= 0.36.1, < 1.0.0)
mini_magick (~> 4.0.2)
fuzzy_match (2.0.4)
google-api-client (0.9.2)
activesupport (>= 3.2)
google-api-client (0.9.4)
addressable (~> 2.3)
googleauth (~> 0.5)
httpclient (~> 2.7)
hurley (~> 0.1)
memoist (~> 0.11)
mime-types (>= 1.6)
multi_json (~> 1.11)
representable (~> 2.3.0)
retriable (~> 2.0)
thor (~> 0.19)
Expand All @@ -135,7 +132,7 @@ GEM
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
gym (1.6.1)
gym (1.6.2)
fastlane_core (>= 0.36.1, < 1.0.0)
plist
rubyzip (>= 1.1.7)
Expand All @@ -148,7 +145,7 @@ GEM
hurley (0.2)
i18n (0.7.0)
json (1.8.3)
jwt (1.5.2)
jwt (1.5.3)
krausefx-shenzhen (0.14.7)
commander (~> 4.3)
dotenv (>= 0.7)
Expand All @@ -162,21 +159,20 @@ GEM
security (~> 0.1.3)
terminal-table (~> 1.4.5)
little-plugger (1.1.4)
logging (2.0.0)
logging (2.1.0)
little-plugger (~> 1.1)
multi_json (~> 1.10)
match (0.3.0)
match (0.4.0)
cert (>= 1.2.8, < 2.0.0)
credentials_manager (>= 0.13.0, < 1.0.0)
fastlane_core (>= 0.36.1, < 1.0.0)
fastlane_core (>= 0.39.0, < 1.0.0)
security
sigh (>= 1.2.2, < 2.0.0)
spaceship (>= 0.18.1, < 1.0.0)
spaceship (>= 0.24.0, < 1.0.0)
memoist (0.14.0)
method_source (0.8.2)
mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2015.1120)
mime-types-data (3.2016.0221)
mini_magick (4.0.4)
mini_portile2 (2.0.0)
minitest (5.8.4)
Expand All @@ -187,14 +183,14 @@ GEM
nap (1.1.0)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (3.0.2)
net-ssh (3.1.1)
netrc (0.7.8)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
os (0.9.6)
pem (1.2.0)
pem (1.3.0)
fastlane_core (>= 0.36.1, < 1.0.0)
spaceship (>= 0.19.3, < 1.0.0)
spaceship (>= 0.22.0, < 1.0.0)
pilot (1.4.1)
credentials_manager (>= 0.3.0)
fastlane_core (>= 0.36.5, < 1.0.0)
Expand All @@ -204,30 +200,26 @@ GEM
produce (1.1.1)
fastlane_core (>= 0.30.0, < 1.0.0)
spaceship (>= 0.16.0)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
representable (2.3.0)
uber (~> 0.0.7)
retriable (2.1.0)
rouge (1.10.1)
rubyzip (1.1.7)
scan (0.5.0)
scan (0.5.2)
fastlane_core (>= 0.36.1, < 1.0.0)
slack-notifier (~> 1.3)
terminal-table
xcpretty (>= 0.2.1)
xcpretty-travis-formatter (>= 0.0.3)
screengrab (0.2.0)
fastlane_core (>= 0.36.1, < 1.0.0)
screengrab (0.3.1)
fastlane_core (>= 0.38.0, < 1.0.0)
security (0.1.3)
sentry-raven (0.15.5)
sentry-raven (0.15.6)
faraday (>= 0.7.6)
sigh (1.3.1)
sigh (1.6.0)
fastlane_core (>= 0.36.1, < 1.0.0)
plist (~> 3.1)
spaceship (>= 0.12.3)
spaceship (>= 0.22.0, < 1.0.0)
signet (0.7.2)
addressable (~> 2.3)
faraday (~> 0.9)
Expand All @@ -238,13 +230,12 @@ GEM
clamp (~> 0.6)
nokogiri (~> 1.6.3)
xcodeproj (>= 0.28.2, < 1.1.0)
slop (3.6.0)
snapshot (1.8.0)
snapshot (1.12.1)
fastimage (~> 1.6.3)
fastlane_core (>= 0.36.1, < 1.0.0)
plist (~> 3.1.0)
xcpretty (>= 0.2.1)
spaceship (0.21.0)
spaceship (0.24.0)
colored
credentials_manager (>= 0.9.0)
faraday (~> 0.9)
Expand All @@ -253,8 +244,7 @@ GEM
fastimage (~> 1.6)
multi_xml (~> 0.5)
plist (~> 3.1)
pry
supply (0.4.0)
supply (0.5.2)
credentials_manager (>= 0.15.0)
fastlane_core (>= 0.35.0)
google-api-client (~> 0.9.1)
Expand Down
6 changes: 3 additions & 3 deletions fastlane/.env.default
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
AF_IOS_SDK=iphonesimulator9.2
AF_IOS_SDK=iphonesimulator9.3
AF_MAC_SDK=macosx10.11
AF_TVOS_SDK=appletvsimulator9.1
AF_TVOS_SDK=appletvsimulator9.2

AF_CONFIGURATION=Release

SCAN_SCHEME=$AF_IOS_FRAMEWORK_SCHEME
SCAN_DESTINATION="OS=9.2,name=iPhone 6s"
SCAN_DESTINATION="OS=9.3,name=iPhone 6s"
SCAN_SDK=$AF_IOS_SDK
SCAN_OUTPUT_DIRECTORY=fastlane/test-output
DEPLOY_PODSPEC=TanukiKit.podspec
Expand Down
4 changes: 2 additions & 2 deletions fastlane/.env.ios92
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
SCAN_DESTINATION="OS=9.2,name=iPhone 6s"
EXAMPLE_DESTINATION=$SCAN_DESTINATION
SCAN_DESTINATION="OS=9.3,name=iPhone 6s"
EXAMPLE_DESTINATION=$SCAN_DESTINATION
4 changes: 2 additions & 2 deletions fastlane/.env.tvos91
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SCAN_SCHEME=$AF_TVOS_FRAMEWORK_SCHEME
SCAN_DESTINATION="OS=9.1,name=Apple TV 1080p"
SCAN_DESTINATION="OS=9.2,name=Apple TV 1080p"
SCAN_SDK=$AF_TVOS_SDK

EXAMPLE_SCHEME=$AF_TVOS_EXAMPLE_SCHEME
EXAMPLE_DESTINATION=$SCAN_DESTINATION
EXAMPLE_DESTINATION=$SCAN_DESTINATION