Skip to content

Commit 569fff7

Browse files
authored
Merge pull request #28 from bcylin/feature/xcode-10
Xcode 10
2 parents 8765c5d + 4023eef commit 569fff7

File tree

6 files changed

+30
-32
lines changed

6 files changed

+30
-32
lines changed

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9.3beta
2+
osx_image: xcode10
33
cache:
44
bundler: true
55
directories:
@@ -8,13 +8,13 @@ cache:
88
before_install:
99
- export LANG=en_US.UTF-8
1010
- xcrun instruments -s devices
11-
- open -b com.apple.iphonesimulator
11+
- xcrun instruments -w "iPhone X (12.0) [" || true
1212
install:
1313
- make install
1414
before_script:
1515
- xcodebuild -workspace ICInputAccessory.xcworkspace -list
1616
script:
17-
- bundle exec rake ci:test
17+
- bundle exec rake "ci:test[12.0]"
1818
- make -B carthage
1919
- make -B docs
2020
notifications:

Gemfile.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ GEM
99
tzinfo (~> 1.1)
1010
addressable (2.5.2)
1111
public_suffix (>= 2.0.2, < 4.0)
12-
atomos (0.1.2)
12+
atomos (0.1.3)
1313
claide (1.0.2)
1414
claide-plugins (0.9.2)
1515
cork
1616
nap
1717
open4 (~> 1.3)
18-
cocoapods (1.5.0)
18+
cocoapods (1.5.3)
1919
activesupport (>= 4.0.2, < 5)
2020
claide (>= 1.0.2, < 2.0)
21-
cocoapods-core (= 1.5.0)
21+
cocoapods-core (= 1.5.3)
2222
cocoapods-deintegrate (>= 1.0.2, < 2.0)
2323
cocoapods-downloader (>= 1.2.0, < 2.0)
2424
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -34,17 +34,17 @@ GEM
3434
nap (~> 1.0)
3535
ruby-macho (~> 1.1)
3636
xcodeproj (>= 1.5.7, < 2.0)
37-
cocoapods-core (1.5.0)
37+
cocoapods-core (1.5.3)
3838
activesupport (>= 4.0.2, < 6)
3939
fuzzy_match (~> 2.0.4)
4040
nap (~> 1.0)
4141
cocoapods-deintegrate (1.0.2)
42-
cocoapods-downloader (1.2.0)
42+
cocoapods-downloader (1.2.1)
4343
cocoapods-plugins (1.0.0)
4444
nap
4545
cocoapods-search (1.0.0)
4646
cocoapods-stats (1.0.0)
47-
cocoapods-trunk (1.3.0)
47+
cocoapods-trunk (1.3.1)
4848
nap (>= 0.8, < 2.0)
4949
netrc (~> 0.11)
5050
cocoapods-try (1.1.0)
@@ -53,31 +53,31 @@ GEM
5353
concurrent-ruby (1.0.5)
5454
cork (0.3.0)
5555
colored2 (~> 3.1)
56-
danger (5.5.11)
56+
danger (5.6.7)
5757
claide (~> 1.0)
5858
claide-plugins (>= 0.9.2)
5959
colored2 (~> 3.1)
6060
cork (~> 0.1)
6161
faraday (~> 0.9)
6262
faraday-http-cache (~> 1.0)
63-
git (~> 1)
63+
git (~> 1.5)
6464
kramdown (~> 1.5)
6565
no_proxy_fix
6666
octokit (~> 4.7)
6767
terminal-table (~> 1)
6868
escape (0.0.4)
69-
faraday (0.14.0)
69+
faraday (0.15.3)
7070
multipart-post (>= 1.2, < 3)
7171
faraday-http-cache (1.3.1)
7272
faraday (~> 0.8)
73-
ffi (1.9.23)
73+
ffi (1.9.25)
7474
fourflusher (2.0.1)
7575
fuzzy_match (2.0.4)
7676
gh_inspector (1.1.3)
77-
git (1.3.0)
77+
git (1.5.0)
7878
i18n (0.9.5)
7979
concurrent-ruby (~> 1.0)
80-
jazzy (0.9.1)
80+
jazzy (0.9.3)
8181
cocoapods (~> 1.0)
8282
mustache (~> 0.99)
8383
open4
@@ -86,32 +86,32 @@ GEM
8686
sass (~> 3.4)
8787
sqlite3 (~> 1.3)
8888
xcinvoke (~> 0.3.0)
89-
kramdown (1.16.2)
89+
kramdown (1.17.0)
9090
liferaft (0.0.6)
9191
method_source (0.9.0)
9292
minitest (5.11.3)
93-
molinillo (0.6.5)
93+
molinillo (0.6.6)
9494
multipart-post (2.0.0)
9595
mustache (0.99.8)
96-
nanaimo (0.2.5)
96+
nanaimo (0.2.6)
9797
nap (1.1.0)
9898
netrc (0.11.0)
9999
no_proxy_fix (0.1.2)
100-
octokit (4.8.0)
100+
octokit (4.12.0)
101101
sawyer (~> 0.8.0, >= 0.5.3)
102102
open4 (1.3.4)
103103
pry (0.11.3)
104104
coderay (~> 1.1.0)
105105
method_source (~> 0.9.0)
106-
public_suffix (3.0.2)
106+
public_suffix (3.0.3)
107107
rake (12.3.1)
108108
rb-fsevent (0.10.3)
109109
rb-inotify (0.9.10)
110110
ffi (>= 0.5.0, < 2)
111111
redcarpet (3.4.0)
112112
rouge (2.0.7)
113-
ruby-macho (1.1.0)
114-
sass (3.5.6)
113+
ruby-macho (1.3.1)
114+
sass (3.6.0)
115115
sass-listen (~> 4.0.0)
116116
sass-listen (4.0.0)
117117
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -125,16 +125,16 @@ GEM
125125
thread_safe (0.3.6)
126126
tzinfo (1.2.5)
127127
thread_safe (~> 0.1)
128-
unicode-display_width (1.3.0)
128+
unicode-display_width (1.4.0)
129129
xcinvoke (0.3.0)
130130
liferaft (~> 0.0.6)
131-
xcodeproj (1.5.7)
131+
xcodeproj (1.6.0)
132132
CFPropertyList (>= 2.3.3, < 4.0)
133-
atomos (~> 0.1.2)
133+
atomos (~> 0.1.3)
134134
claide (>= 1.0.2, < 2.0)
135135
colored2 (~> 3.1)
136-
nanaimo (~> 0.2.4)
137-
xcpretty (0.2.8)
136+
nanaimo (~> 0.2.6)
137+
xcpretty (0.3.0)
138138
rouge (~> 2.0.7)
139139

140140
PLATFORMS
@@ -149,4 +149,4 @@ DEPENDENCIES
149149
xcpretty
150150

151151
BUNDLED WITH
152-
1.16.1
152+
1.16.4

Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
1313

1414
PODFILE CHECKSUM: 74bc2bf59f17e7cc006ae2aa1d4d73e50cc2b4ff
1515

16-
COCOAPODS: 1.5.0
16+
COCOAPODS: 1.5.3

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def xcodebuild(params)
2222
%(-workspace ICInputAccessory.xcworkspace),
2323
%(-scheme #{params[:scheme]}),
2424
%(-sdk iphonesimulator),
25-
%(-destination 'name=iPhone 8,OS=#{params[:version] || "latest"}'),
25+
%(-destination 'name=iPhone X,OS=#{params[:version] || "latest"}'),
2626
%(#{params[:action]} | xcpretty -c && exit ${PIPESTATUS[0]})
2727
].join " "
2828
end

0 commit comments

Comments
 (0)