Skip to content

Commit 2126a6a

Browse files
committed
Add Swift 5.0, Xcode 11 & iOS 13 SDK support
1 parent 71c62aa commit 2126a6a

File tree

14 files changed

+204
-139
lines changed

14 files changed

+204
-139
lines changed

.gitignore

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# OSX
2+
.DS_Store
3+
4+
# Xcode
5+
#
6+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
7+
8+
## Build generated
9+
build/
10+
DerivedData/
11+
12+
## Various settings
13+
*.pbxuser
14+
!default.pbxuser
15+
*.mode1v3
16+
!default.mode1v3
17+
*.mode2v3
18+
!default.mode2v3
19+
*.perspectivev3
20+
!default.perspectivev3
21+
xcuserdata/
22+
23+
## Other
24+
*.moved-aside
25+
*.xccheckout
26+
*.xcscmblueprint
27+
28+
## Obj-C/Swift specific
29+
*.hmap
30+
*.ipa
31+
*.dSYM.zip
32+
*.dSYM
33+
34+
## Playgrounds
35+
timeline.xctimeline
36+
playground.xcworkspace
37+
38+
# Swift Package Manager
39+
#
40+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
41+
# Packages/
42+
# Package.pins
43+
# Package.resolved
44+
.build/
45+
46+
# CocoaPods
47+
#
48+
# We recommend against adding the Pods directory to your .gitignore. However
49+
# you should judge for yourself, the pros and cons are mentioned at:
50+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
51+
#
52+
Pods/
53+
54+
# Carthage
55+
#
56+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
57+
# Carthage/Checkouts
58+
59+
Carthage/*
60+
61+
# fastlane
62+
#
63+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
64+
# screenshots whenever they are needed.
65+
# For more information about the recommended setup visit:
66+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
67+
68+
fastlane/report.xml
69+
fastlane/Preview.html
70+
fastlane/screenshots
71+
fastlane/test_output
72+
73+
# Configuration Repository
74+
/Configuration/
75+
/Ambidexter/Configuration/Files/*
76+
!/Ambidexter/Configuration/Files/README.md
77+
!/Ambidexter/Configuration/Files/*.template

Cartfile.private

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "quick/quick" ~> 1.3.1
2-
github "quick/nimble" ~> 7.1.3
1+
github "quick/quick" ~> 2.1.0
2+
github "quick/nimble" ~> 8.0.4

Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "jdg/MBProgressHUD" "1.1.0"
2-
github "quick/nimble" "v7.1.3"
3-
github "quick/quick" "v1.3.1"
2+
github "quick/nimble" "v8.0.4"
3+
github "quick/quick" "v2.1.0"

Gemfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
ruby "~> 2.5.1"
2-
31
source 'https://rubygems.org'
4-
gem 'cocoapods', '~> 1.5.3'
5-
gem 'fastlane', '~> 2.107.0'
2+
gem 'cocoapods', '~> 1.7.5'
3+
gem 'fastlane', '~> 2.131.0'

Gemfile.lock

Lines changed: 64 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,93 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.0)
5-
activesupport (4.2.10)
4+
CFPropertyList (3.0.1)
5+
activesupport (4.2.11.1)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
addressable (2.5.2)
11-
public_suffix (>= 2.0.2, < 4.0)
10+
addressable (2.7.0)
11+
public_suffix (>= 2.0.2, < 5.0)
1212
atomos (0.1.3)
1313
babosa (1.0.2)
14-
claide (1.0.2)
15-
cocoapods (1.5.3)
14+
claide (1.0.3)
15+
cocoapods (1.7.5)
1616
activesupport (>= 4.0.2, < 5)
1717
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.5.3)
19-
cocoapods-deintegrate (>= 1.0.2, < 2.0)
20-
cocoapods-downloader (>= 1.2.0, < 2.0)
18+
cocoapods-core (= 1.7.5)
19+
cocoapods-deintegrate (>= 1.0.3, < 2.0)
20+
cocoapods-downloader (>= 1.2.2, < 2.0)
2121
cocoapods-plugins (>= 1.0.0, < 2.0)
2222
cocoapods-search (>= 1.0.0, < 2.0)
2323
cocoapods-stats (>= 1.0.0, < 2.0)
24-
cocoapods-trunk (>= 1.3.0, < 2.0)
24+
cocoapods-trunk (>= 1.3.1, < 2.0)
2525
cocoapods-try (>= 1.1.0, < 2.0)
2626
colored2 (~> 3.1)
2727
escape (~> 0.0.4)
28-
fourflusher (~> 2.0.1)
28+
fourflusher (>= 2.3.0, < 3.0)
2929
gh_inspector (~> 1.0)
30-
molinillo (~> 0.6.5)
30+
molinillo (~> 0.6.6)
3131
nap (~> 1.0)
32-
ruby-macho (~> 1.1)
33-
xcodeproj (>= 1.5.7, < 2.0)
34-
cocoapods-core (1.5.3)
32+
ruby-macho (~> 1.4)
33+
xcodeproj (>= 1.10.0, < 2.0)
34+
cocoapods-core (1.7.5)
3535
activesupport (>= 4.0.2, < 6)
3636
fuzzy_match (~> 2.0.4)
3737
nap (~> 1.0)
38-
cocoapods-deintegrate (1.0.2)
38+
cocoapods-deintegrate (1.0.4)
3939
cocoapods-downloader (1.2.2)
4040
cocoapods-plugins (1.0.0)
4141
nap
4242
cocoapods-search (1.0.0)
43-
cocoapods-stats (1.0.0)
44-
cocoapods-trunk (1.3.1)
43+
cocoapods-stats (1.1.0)
44+
cocoapods-trunk (1.4.0)
4545
nap (>= 0.8, < 2.0)
4646
netrc (~> 0.11)
4747
cocoapods-try (1.1.0)
4848
colored (1.2)
4949
colored2 (3.1.2)
5050
commander-fastlane (4.4.6)
5151
highline (~> 1.7.2)
52-
concurrent-ruby (1.0.5)
52+
concurrent-ruby (1.1.5)
5353
declarative (0.0.10)
5454
declarative-option (0.1.0)
55-
domain_name (0.5.20180417)
55+
digest-crc (0.4.1)
56+
domain_name (0.5.20190701)
5657
unf (>= 0.0.5, < 1.0.0)
57-
dotenv (2.5.0)
58-
emoji_regex (0.1.1)
58+
dotenv (2.7.5)
59+
emoji_regex (1.0.1)
5960
escape (0.0.4)
60-
excon (0.62.0)
61-
faraday (0.15.3)
61+
excon (0.66.0)
62+
faraday (0.15.4)
6263
multipart-post (>= 1.2, < 3)
6364
faraday-cookie_jar (0.0.6)
6465
faraday (>= 0.7.4)
6566
http-cookie (~> 1.0.0)
66-
faraday_middleware (0.12.2)
67+
faraday_middleware (0.13.1)
6768
faraday (>= 0.7.4, < 1.0)
68-
fastimage (2.1.4)
69-
fastlane (2.107.0)
69+
fastimage (2.1.7)
70+
fastlane (2.131.0)
7071
CFPropertyList (>= 2.3, < 4.0.0)
7172
addressable (>= 2.3, < 3.0.0)
7273
babosa (>= 1.0.2, < 2.0.0)
73-
bundler (>= 1.12.0, < 2.0.0)
74+
bundler (>= 1.12.0, < 3.0.0)
7475
colored
7576
commander-fastlane (>= 4.4.6, < 5.0.0)
7677
dotenv (>= 2.1.1, < 3.0.0)
77-
emoji_regex (~> 0.1)
78+
emoji_regex (>= 0.1, < 2.0)
7879
excon (>= 0.45.0, < 1.0.0)
7980
faraday (~> 0.9)
8081
faraday-cookie_jar (~> 0.0.6)
8182
faraday_middleware (~> 0.9)
8283
fastimage (>= 2.1.0, < 3.0.0)
8384
gh_inspector (>= 1.1.2, < 2.0.0)
8485
google-api-client (>= 0.21.2, < 0.24.0)
86+
google-cloud-storage (>= 1.15.0, < 2.0.0)
8587
highline (>= 1.7.2, < 2.0.0)
8688
json (< 3.0.0)
87-
mini_magick (~> 4.5.1)
88-
multi_json
89+
jwt (~> 2.1.0)
90+
mini_magick (>= 4.9.4, < 5.0.0)
8991
multi_xml (~> 0.5)
9092
multipart-post (~> 2.0.0)
9193
plist (>= 3.1.0, < 4.0.0)
@@ -94,15 +96,15 @@ GEM
9496
security (= 0.1.3)
9597
simctl (~> 1.6.3)
9698
slack-notifier (>= 2.0.0, < 3.0.0)
97-
terminal-notifier (>= 1.6.2, < 2.0.0)
99+
terminal-notifier (>= 2.0.0, < 3.0.0)
98100
terminal-table (>= 1.4.5, < 2.0.0)
99101
tty-screen (>= 0.6.3, < 1.0.0)
100102
tty-spinner (>= 0.8.0, < 1.0.0)
101103
word_wrap (~> 1.0.0)
102-
xcodeproj (>= 1.6.0, < 2.0.0)
104+
xcodeproj (>= 1.8.1, < 2.0.0)
103105
xcpretty (~> 0.3.0)
104106
xcpretty-travis-formatter (>= 0.0.3)
105-
fourflusher (2.0.1)
107+
fourflusher (2.3.1)
106108
fuzzy_match (2.0.4)
107109
gh_inspector (1.1.3)
108110
google-api-client (0.23.9)
@@ -113,6 +115,15 @@ GEM
113115
representable (~> 3.0)
114116
retriable (>= 2.0, < 4.0)
115117
signet (~> 0.9)
118+
google-cloud-core (1.3.1)
119+
google-cloud-env (~> 1.0)
120+
google-cloud-env (1.2.1)
121+
faraday (~> 0.11)
122+
google-cloud-storage (1.16.0)
123+
digest-crc (~> 0.4)
124+
google-api-client (~> 0.23)
125+
google-cloud-core (~> 1.2)
126+
googleauth (>= 0.6.2, < 0.10.0)
116127
googleauth (0.6.7)
117128
faraday (~> 0.12)
118129
jwt (>= 1.4, < 3.0)
@@ -126,13 +137,13 @@ GEM
126137
httpclient (2.8.3)
127138
i18n (0.9.5)
128139
concurrent-ruby (~> 1.0)
129-
json (2.1.0)
140+
json (2.2.0)
130141
jwt (2.1.0)
131142
memoist (0.16.0)
132-
mime-types (3.2.2)
143+
mime-types (3.3)
133144
mime-types-data (~> 3.2015)
134-
mime-types-data (3.2018.0812)
135-
mini_magick (4.5.1)
145+
mime-types-data (3.2019.0904)
146+
mini_magick (4.9.5)
136147
minitest (5.11.3)
137148
molinillo (0.6.6)
138149
multi_json (1.13.1)
@@ -142,17 +153,17 @@ GEM
142153
nap (1.1.0)
143154
naturally (2.2.0)
144155
netrc (0.11.0)
145-
os (1.0.0)
146-
plist (3.4.0)
156+
os (1.0.1)
157+
plist (3.5.0)
147158
public_suffix (2.0.5)
148159
representable (3.0.4)
149160
declarative (< 0.1.0)
150161
declarative-option (< 0.2.0)
151162
uber (< 0.2.0)
152163
retriable (3.1.2)
153164
rouge (2.0.7)
154-
ruby-macho (1.3.1)
155-
rubyzip (1.2.2)
165+
ruby-macho (1.4.0)
166+
rubyzip (1.2.4)
156167
security (0.1.3)
157168
signet (0.11.0)
158169
addressable (~> 2.3)
@@ -163,23 +174,23 @@ GEM
163174
CFPropertyList
164175
naturally
165176
slack-notifier (2.3.2)
166-
terminal-notifier (1.8.0)
177+
terminal-notifier (2.0.0)
167178
terminal-table (1.8.0)
168179
unicode-display_width (~> 1.1, >= 1.1.1)
169180
thread_safe (0.3.6)
170-
tty-cursor (0.6.0)
171-
tty-screen (0.6.5)
172-
tty-spinner (0.8.0)
173-
tty-cursor (>= 0.5.0)
181+
tty-cursor (0.7.0)
182+
tty-screen (0.7.0)
183+
tty-spinner (0.9.1)
184+
tty-cursor (~> 0.7)
174185
tzinfo (1.2.5)
175186
thread_safe (~> 0.1)
176187
uber (0.1.0)
177188
unf (0.1.4)
178189
unf_ext
179-
unf_ext (0.0.7.5)
180-
unicode-display_width (1.4.0)
190+
unf_ext (0.0.7.6)
191+
unicode-display_width (1.6.0)
181192
word_wrap (1.0.0)
182-
xcodeproj (1.7.0)
193+
xcodeproj (1.12.0)
183194
CFPropertyList (>= 2.3.3, < 4.0)
184195
atomos (~> 0.1.3)
185196
claide (>= 1.0.2, < 2.0)
@@ -194,11 +205,8 @@ PLATFORMS
194205
ruby
195206

196207
DEPENDENCIES
197-
cocoapods (~> 1.5.3)
198-
fastlane (~> 2.107.0)
199-
200-
RUBY VERSION
201-
ruby 2.5.1p57
208+
cocoapods (~> 1.7.5)
209+
fastlane (~> 2.131.0)
202210

203211
BUNDLED WITH
204-
1.16.6
212+
2.0.2

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ install_bundler_gem:
5454
$(info Checking and install bundler ...)
5555

5656
ifeq ($(BUNDLER),)
57-
gem install bundler -v '~> 1.16'
57+
gem install bundler -v '~> 2.0'
5858
else
59-
gem update bundler '~> 1.16'
59+
gem update bundler '~> 2.0'
6060
endif
6161

6262
# Install Ruby Gems
@@ -89,4 +89,4 @@ install_carthage_dependencies:
8989
unit_test:
9090
$(info Run Unittests ...)
9191

92-
fastlane test
92+
bundle exec fastlane test

Podfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ platform :ios, '11.0'
33
use_frameworks!
44

55
target 'iOSProjectSetup' do
6-
pod 'Alamofire', '4.7.3'
7-
pod 'RxSwift', '4.3.1'
8-
pod 'RxCocoa', '4.3.1'
6+
pod 'Alamofire', '4.9.0'
7+
pod 'RxSwift', '5.0.0'
8+
pod 'RxCocoa', '5.0.0'
99
end
1010

1111
target 'iOSProjectSetupTests' do
12-
pod 'RxSwift', '4.3.1'
13-
pod 'RxCocoa', '4.3.1'
14-
pod 'RxBlocking', '4.3.1'
15-
pod 'RxTest', '4.3.1'
12+
pod 'RxSwift', '5.0.0'
13+
pod 'RxCocoa', '5.0.0'
14+
pod 'RxBlocking', '5.0.0'
15+
pod 'RxTest', '5.0.0'
1616
end
1717

1818
post_install do |installer|
1919
installer.pods_project.targets.each do |target|
2020
target.build_configurations.each do |config|
2121

22-
config.build_settings['SWIFT_VERSION'] = '4.2'
22+
config.build_settings['SWIFT_VERSION'] = '5.0'
2323
config.build_settings['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = '$(inherited)'
2424

2525
config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = ''

0 commit comments

Comments
 (0)