Skip to content

Commit ff9be50

Browse files
committed
Merge branch 'feature/xcode10'
[skip ci]
2 parents 78f05b9 + f019020 commit ff9be50

16 files changed

Lines changed: 174 additions & 126 deletions

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.4
1+
2.5.1

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
os: osx
2-
osx_image: xcode9
2+
osx_image: xcode10
33

44
before_install:
55
- bundle install --without=documentation --path ../travis_bundle_dir

CHANGELOG.md

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
1-
# 3.0.2
1+
# Changelog
2+
3+
## 4.0.0
4+
5+
- Swift 4.2 compatible version
6+
- Hide uncessary information about `Decodable` implementation
7+
8+
## 3.0.2
9+
210
- Fix disruptions parsing.
311

4-
# 3.0.1
12+
## 3.0.1
13+
514
- Fix invalid URL construction for request including a departudecode
615
- Fix parsing error for next departures. [#1](https://github.com/yageek/TPGSwift/issues/1)
716

8-
# 3.0.0
17+
## 3.0.0
18+
919
- Swift 4 support
1020

11-
# 2.1.0
21+
## 2.1.0
22+
1223
- Fix enum code style.
1324

14-
# 2.0.0:
25+
## 2.0.0:
26+
1527
- Swift 3 compatible.
1628

17-
# 1.0.0
29+
## 1.0.0
30+
1831
- Basic JSON unmarshal structures.

Gemfile.lock

Lines changed: 131 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,200 +1,239 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.5)
5-
activesupport (4.2.9)
4+
CFPropertyList (2.3.6)
5+
activesupport (4.2.11)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
addressable (2.5.1)
11-
public_suffix (~> 2.0, >= 2.0.2)
10+
addressable (2.6.0)
11+
public_suffix (>= 2.0.2, < 4.0)
12+
atomos (0.1.3)
1213
babosa (1.0.2)
1314
claide (1.0.2)
1415
clamp (0.6.5)
15-
cocoapods (1.2.1)
16+
cocoapods (1.6.0)
1617
activesupport (>= 4.0.2, < 5)
17-
claide (>= 1.0.1, < 2.0)
18-
cocoapods-core (= 1.2.1)
19-
cocoapods-deintegrate (>= 1.0.1, < 2.0)
20-
cocoapods-downloader (>= 1.1.3, < 2.0)
18+
claide (>= 1.0.2, < 2.0)
19+
cocoapods-core (= 1.6.0)
20+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
21+
cocoapods-downloader (>= 1.2.2, < 2.0)
2122
cocoapods-plugins (>= 1.0.0, < 2.0)
2223
cocoapods-search (>= 1.0.0, < 2.0)
2324
cocoapods-stats (>= 1.0.0, < 2.0)
24-
cocoapods-trunk (>= 1.2.0, < 2.0)
25+
cocoapods-trunk (>= 1.3.1, < 2.0)
2526
cocoapods-try (>= 1.1.0, < 2.0)
2627
colored2 (~> 3.1)
2728
escape (~> 0.0.4)
28-
fourflusher (~> 2.0.1)
29+
fourflusher (>= 2.2.0, < 3.0)
2930
gh_inspector (~> 1.0)
30-
molinillo (~> 0.5.7)
31+
molinillo (~> 0.6.6)
3132
nap (~> 1.0)
32-
ruby-macho (~> 1.1)
33-
xcodeproj (>= 1.4.4, < 2.0)
34-
cocoapods-core (1.2.1)
35-
activesupport (>= 4.0.2, < 5)
33+
ruby-macho (~> 1.3, >= 1.3.1)
34+
xcodeproj (>= 1.8.0, < 2.0)
35+
cocoapods-core (1.6.0)
36+
activesupport (>= 4.0.2, < 6)
3637
fuzzy_match (~> 2.0.4)
3738
nap (~> 1.0)
38-
cocoapods-deintegrate (1.0.1)
39-
cocoapods-downloader (1.1.3)
39+
cocoapods-deintegrate (1.0.2)
40+
cocoapods-downloader (1.2.2)
4041
cocoapods-plugins (1.0.0)
4142
nap
4243
cocoapods-search (1.0.0)
43-
cocoapods-stats (1.0.0)
44-
cocoapods-trunk (1.2.0)
44+
cocoapods-stats (1.1.0)
45+
cocoapods-trunk (1.3.1)
4546
nap (>= 0.8, < 2.0)
46-
netrc (= 0.7.8)
47+
netrc (~> 0.11)
4748
cocoapods-try (1.1.0)
4849
colored (1.2)
4950
colored2 (3.1.2)
50-
commander-fastlane (4.4.5)
51+
commander-fastlane (4.4.6)
5152
highline (~> 1.7.2)
52-
declarative (0.0.9)
53+
concurrent-ruby (1.1.4)
54+
declarative (0.0.10)
5355
declarative-option (0.1.0)
54-
domain_name (0.5.20170404)
56+
digest-crc (0.4.1)
57+
domain_name (0.5.20180417)
5558
unf (>= 0.0.5, < 1.0.0)
56-
dotenv (2.2.1)
59+
dotenv (2.6.0)
60+
emoji_regex (1.0.1)
5761
escape (0.0.4)
58-
excon (0.57.1)
59-
faraday (0.12.1)
62+
excon (0.62.0)
63+
faraday (0.15.4)
6064
multipart-post (>= 1.2, < 3)
6165
faraday-cookie_jar (0.0.6)
6266
faraday (>= 0.7.4)
6367
http-cookie (~> 1.0.0)
64-
faraday_middleware (0.11.0.1)
68+
faraday_middleware (0.13.1)
6569
faraday (>= 0.7.4, < 1.0)
66-
fastimage (2.1.0)
67-
fastlane (2.44.1)
68-
CFPropertyList (>= 2.3, < 3.0.0)
70+
fastimage (2.1.5)
71+
fastlane (2.116.0)
72+
CFPropertyList (>= 2.3, < 4.0.0)
6973
addressable (>= 2.3, < 3.0.0)
7074
babosa (>= 1.0.2, < 2.0.0)
71-
bundler (>= 1.12.0, < 2.0.0)
75+
bundler (>= 1.12.0, < 3.0.0)
7276
colored
73-
commander-fastlane (>= 4.4.5, < 5.0.0)
77+
commander-fastlane (>= 4.4.6, < 5.0.0)
7478
dotenv (>= 2.1.1, < 3.0.0)
79+
emoji_regex (>= 0.1, < 2.0)
7580
excon (>= 0.45.0, < 1.0.0)
7681
faraday (~> 0.9)
7782
faraday-cookie_jar (~> 0.0.6)
7883
faraday_middleware (~> 0.9)
7984
fastimage (>= 2.1.0, < 3.0.0)
80-
gh_inspector (>= 1.0.1, < 2.0.0)
81-
google-api-client (>= 0.12.0, < 0.13.0)
85+
gh_inspector (>= 1.1.2, < 2.0.0)
86+
google-api-client (>= 0.21.2, < 0.24.0)
87+
google-cloud-storage (>= 1.15.0, < 2.0.0)
8288
highline (>= 1.7.2, < 2.0.0)
8389
json (< 3.0.0)
8490
mini_magick (~> 4.5.1)
8591
multi_json
8692
multi_xml (~> 0.5)
8793
multipart-post (~> 2.0.0)
8894
plist (>= 3.1.0, < 4.0.0)
89-
rubyzip (>= 1.1.0, < 2.0.0)
95+
public_suffix (~> 2.0.0)
96+
rubyzip (>= 1.2.2, < 2.0.0)
9097
security (= 0.1.3)
91-
slack-notifier (>= 1.3, < 2.0.0)
98+
simctl (~> 1.6.3)
99+
slack-notifier (>= 2.0.0, < 3.0.0)
92100
terminal-notifier (>= 1.6.2, < 2.0.0)
93101
terminal-table (>= 1.4.5, < 2.0.0)
94-
tty-screen (~> 0.5.0)
102+
tty-screen (>= 0.6.3, < 1.0.0)
103+
tty-spinner (>= 0.8.0, < 1.0.0)
95104
word_wrap (~> 1.0.0)
96-
xcodeproj (>= 1.4.4, < 2.0.0)
97-
xcpretty (>= 0.2.4, < 1.0.0)
105+
xcodeproj (>= 1.6.0, < 2.0.0)
106+
xcpretty (~> 0.3.0)
98107
xcpretty-travis-formatter (>= 0.0.3)
99-
fourflusher (2.0.1)
108+
ffi (1.10.0)
109+
fourflusher (2.2.0)
100110
fuzzy_match (2.0.4)
101-
gh_inspector (1.0.3)
102-
google-api-client (0.12.0)
111+
gh_inspector (1.1.3)
112+
google-api-client (0.23.9)
103113
addressable (~> 2.5, >= 2.5.1)
104-
googleauth (~> 0.5)
114+
googleauth (>= 0.5, < 0.7.0)
105115
httpclient (>= 2.8.1, < 3.0)
106116
mime-types (~> 3.0)
107117
representable (~> 3.0)
108118
retriable (>= 2.0, < 4.0)
109-
googleauth (0.5.1)
110-
faraday (~> 0.9)
111-
jwt (~> 1.4)
112-
logging (~> 2.0)
113-
memoist (~> 0.12)
119+
signet (~> 0.9)
120+
google-cloud-core (1.3.0)
121+
google-cloud-env (~> 1.0)
122+
google-cloud-env (1.0.5)
123+
faraday (~> 0.11)
124+
google-cloud-storage (1.16.0)
125+
digest-crc (~> 0.4)
126+
google-api-client (~> 0.23)
127+
google-cloud-core (~> 1.2)
128+
googleauth (>= 0.6.2, < 0.10.0)
129+
googleauth (0.6.7)
130+
faraday (~> 0.12)
131+
jwt (>= 1.4, < 3.0)
132+
memoist (~> 0.16)
114133
multi_json (~> 1.11)
115-
os (~> 0.9)
134+
os (>= 0.9, < 2.0)
116135
signet (~> 0.7)
117-
highline (1.7.8)
136+
highline (1.7.10)
118137
http-cookie (1.0.3)
119138
domain_name (~> 0.5)
120139
httpclient (2.8.3)
121-
i18n (0.8.4)
122-
jazzy (0.0.14)
123-
activesupport (~> 4.1)
140+
i18n (0.9.5)
141+
concurrent-ruby (~> 1.0)
142+
jazzy (0.9.4)
143+
cocoapods (~> 1.0)
124144
mustache (~> 0.99)
125-
nokogiri (~> 1.6)
145+
open4
126146
redcarpet (~> 3.2)
147+
rouge (>= 2.0.6, < 4.0)
127148
sass (~> 3.4)
149+
sqlite3 (~> 1.3)
150+
xcinvoke (~> 0.3.0)
128151
json (2.1.0)
129-
jwt (1.5.6)
130-
little-plugger (1.1.4)
131-
logging (2.2.2)
132-
little-plugger (~> 1.1)
133-
multi_json (~> 1.10)
152+
jwt (2.1.0)
153+
liferaft (0.0.6)
134154
memoist (0.16.0)
135-
mime-types (3.1)
155+
mime-types (3.2.2)
136156
mime-types-data (~> 3.2015)
137-
mime-types-data (3.2016.0521)
157+
mime-types-data (3.2018.0812)
138158
mini_magick (4.5.1)
139-
mini_portile2 (2.2.0)
140-
minitest (5.10.2)
141-
molinillo (0.5.7)
142-
multi_json (1.12.1)
159+
mini_portile2 (2.3.0)
160+
minitest (5.11.3)
161+
molinillo (0.6.6)
162+
multi_json (1.13.1)
143163
multi_xml (0.6.0)
144164
multipart-post (2.0.0)
145165
mustache (0.99.8)
146-
nanaimo (0.2.3)
166+
nanaimo (0.2.6)
147167
nap (1.1.0)
148-
netrc (0.7.8)
149-
nokogiri (1.8.0)
150-
mini_portile2 (~> 2.2.0)
151-
os (0.9.6)
152-
plist (3.3.0)
168+
naturally (2.2.0)
169+
netrc (0.11.0)
170+
nokogiri (1.8.5)
171+
mini_portile2 (~> 2.3.0)
172+
open4 (1.3.4)
173+
os (1.0.0)
174+
plist (3.5.0)
153175
public_suffix (2.0.5)
176+
rb-fsevent (0.10.3)
177+
rb-inotify (0.10.0)
178+
ffi (~> 1.0)
154179
redcarpet (3.4.0)
155180
representable (3.0.4)
156181
declarative (< 0.1.0)
157182
declarative-option (< 0.2.0)
158183
uber (< 0.2.0)
159-
retriable (3.0.2)
184+
retriable (3.1.2)
160185
rouge (2.0.7)
161-
ruby-macho (1.1.0)
162-
rubyzip (1.2.1)
163-
sass (3.4.24)
186+
ruby-macho (1.3.1)
187+
rubyzip (1.2.2)
188+
sass (3.7.3)
189+
sass-listen (~> 4.0.0)
190+
sass-listen (4.0.0)
191+
rb-fsevent (~> 0.9, >= 0.9.4)
192+
rb-inotify (~> 0.9, >= 0.9.7)
164193
security (0.1.3)
165-
signet (0.7.3)
194+
signet (0.11.0)
166195
addressable (~> 2.3)
167196
faraday (~> 0.9)
168-
jwt (~> 1.5)
197+
jwt (>= 1.5, < 3.0)
169198
multi_json (~> 1.10)
170-
slack-notifier (1.5.1)
171-
slather (2.4.2)
199+
simctl (1.6.5)
200+
CFPropertyList
201+
naturally
202+
slack-notifier (2.3.2)
203+
slather (2.4.6)
172204
CFPropertyList (~> 2.2)
173-
activesupport (>= 4.0.2, < 5)
205+
activesupport (>= 4.0.2)
174206
clamp (~> 0.6)
175-
nokogiri (~> 1.6)
207+
nokogiri (~> 1.8.2)
176208
xcodeproj (~> 1.4)
209+
sqlite3 (1.4.0)
177210
terminal-notifier (1.8.0)
178211
terminal-table (1.8.0)
179212
unicode-display_width (~> 1.1, >= 1.1.1)
180213
thread_safe (0.3.6)
181-
tty-screen (0.5.0)
182-
tzinfo (1.2.3)
214+
tty-cursor (0.6.0)
215+
tty-screen (0.6.5)
216+
tty-spinner (0.9.0)
217+
tty-cursor (~> 0.6.0)
218+
tzinfo (1.2.5)
183219
thread_safe (~> 0.1)
184220
uber (0.1.0)
185221
unf (0.1.4)
186222
unf_ext
187-
unf_ext (0.0.7.4)
188-
unicode-display_width (1.3.0)
223+
unf_ext (0.0.7.5)
224+
unicode-display_width (1.4.1)
189225
word_wrap (1.0.0)
190-
xcodeproj (1.5.0)
191-
CFPropertyList (~> 2.3.3)
226+
xcinvoke (0.3.0)
227+
liferaft (~> 0.0.6)
228+
xcodeproj (1.8.0)
229+
CFPropertyList (>= 2.3.3, < 4.0)
230+
atomos (~> 0.1.3)
192231
claide (>= 1.0.2, < 2.0)
193232
colored2 (~> 3.1)
194-
nanaimo (~> 0.2.3)
195-
xcpretty (0.2.8)
233+
nanaimo (~> 0.2.6)
234+
xcpretty (0.3.0)
196235
rouge (~> 2.0.7)
197-
xcpretty-travis-formatter (0.0.4)
236+
xcpretty-travis-formatter (1.0.0)
198237
xcpretty (~> 0.2, >= 0.0.7)
199238

200239
PLATFORMS
@@ -207,4 +246,4 @@ DEPENDENCIES
207246
slather!
208247

209248
BUNDLED WITH
210-
1.15.1
249+
1.17.1

0 commit comments

Comments
 (0)