Skip to content

Commit fb898a0

Browse files
author
Aaron McTavish
authored
Update to Xcode 9.3 (#71)
* Update gem dependencies * Update to Xcode 9.3 Project Settings * Weak is no longer allowed on protocol properties See Swift Evolution: swiftlang/swift-evolution#707
1 parent e0ca903 commit fb898a0

File tree

12 files changed

+76
-56
lines changed

12 files changed

+76
-56
lines changed

‎FormValidatorSwift.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@
817817
isa = PBXProject;
818818
attributes = {
819819
LastSwiftUpdateCheck = 0820;
820-
LastUpgradeCheck = 0910;
820+
LastUpgradeCheck = 0930;
821821
ORGANIZATIONNAME = ustwo;
822822
TargetAttributes = {
823823
0056755E1C47ED32005A43F0 = {
@@ -1385,12 +1385,14 @@
13851385
CLANG_WARN_BOOL_CONVERSION = YES;
13861386
CLANG_WARN_COMMA = YES;
13871387
CLANG_WARN_CONSTANT_CONVERSION = YES;
1388+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
13881389
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13891390
CLANG_WARN_EMPTY_BODY = YES;
13901391
CLANG_WARN_ENUM_CONVERSION = YES;
13911392
CLANG_WARN_INFINITE_RECURSION = YES;
13921393
CLANG_WARN_INT_CONVERSION = YES;
13931394
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1395+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
13941396
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13951397
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
13961398
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1444,12 +1446,14 @@
14441446
CLANG_WARN_BOOL_CONVERSION = YES;
14451447
CLANG_WARN_COMMA = YES;
14461448
CLANG_WARN_CONSTANT_CONVERSION = YES;
1449+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
14471450
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
14481451
CLANG_WARN_EMPTY_BODY = YES;
14491452
CLANG_WARN_ENUM_CONVERSION = YES;
14501453
CLANG_WARN_INFINITE_RECURSION = YES;
14511454
CLANG_WARN_INT_CONVERSION = YES;
14521455
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1456+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
14531457
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
14541458
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
14551459
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎FormValidatorSwift.xcodeproj/xcshareddata/xcschemes/FormValidatorSwift iOS.xcscheme

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

‎FormValidatorSwift.xcodeproj/xcshareddata/xcschemes/FormValidatorSwift macOS.xcscheme

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
30-
shouldUseLaunchSchemeArgsEnv = "YES"
31-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3231
<Testables>
3332
<TestableReference
3433
skipped = "NO">
@@ -57,7 +56,6 @@
5756
buildConfiguration = "Debug"
5857
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5958
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60-
language = ""
6159
launchStyle = "0"
6260
useCustomWorkingDirectory = "NO"
6361
ignoresPersistentStateOnLaunch = "NO"

‎FormValidatorSwift.xcodeproj/xcshareddata/xcschemes/FormValidatorSwift tvOS.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"

‎FormValidatorSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "https://rubygems.org"
22

33
gem 'fastlane'
44
gem 'jazzy'
5-
gem 'cocoapods', '~> 1.2.0'
5+
gem 'cocoapods', '~> 1.4.0'
66

77
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
88
eval_gemfile(plugins_path) if File.exist?(plugins_path)

‎Gemfile.lock

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.6)
4+
CFPropertyList (3.0.0)
55
activesupport (4.2.10)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
@@ -12,27 +12,27 @@ GEM
1212
atomos (0.1.2)
1313
babosa (1.0.2)
1414
claide (1.0.2)
15-
cocoapods (1.2.1)
15+
cocoapods (1.4.0)
1616
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)
17+
claide (>= 1.0.2, < 2.0)
18+
cocoapods-core (= 1.4.0)
19+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
2020
cocoapods-downloader (>= 1.1.3, < 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.2.0, < 2.0)
24+
cocoapods-trunk (>= 1.3.0, < 2.0)
2525
cocoapods-try (>= 1.1.0, < 2.0)
2626
colored2 (~> 3.1)
2727
escape (~> 0.0.4)
2828
fourflusher (~> 2.0.1)
2929
gh_inspector (~> 1.0)
30-
molinillo (~> 0.5.7)
30+
molinillo (~> 0.6.4)
3131
nap (~> 1.0)
3232
ruby-macho (~> 1.1)
33-
xcodeproj (>= 1.4.4, < 2.0)
34-
cocoapods-core (1.2.1)
35-
activesupport (>= 4.0.2, < 5)
33+
xcodeproj (>= 1.5.4, < 2.0)
34+
cocoapods-core (1.4.0)
35+
activesupport (>= 4.0.2, < 6)
3636
fuzzy_match (~> 2.0.4)
3737
nap (~> 1.0)
3838
cocoapods-deintegrate (1.0.2)
@@ -47,7 +47,7 @@ GEM
4747
cocoapods-try (1.1.0)
4848
colored (1.2)
4949
colored2 (3.1.2)
50-
commander-fastlane (4.4.5)
50+
commander-fastlane (4.4.6)
5151
highline (~> 1.7.2)
5252
concurrent-ruby (1.0.5)
5353
declarative (0.0.10)
@@ -56,7 +56,7 @@ GEM
5656
unf (>= 0.0.5, < 1.0.0)
5757
dotenv (2.2.1)
5858
escape (0.0.4)
59-
excon (0.60.0)
59+
excon (0.62.0)
6060
faraday (0.14.0)
6161
multipart-post (>= 1.2, < 3)
6262
faraday-cookie_jar (0.0.6)
@@ -65,20 +65,20 @@ GEM
6565
faraday_middleware (0.12.2)
6666
faraday (>= 0.7.4, < 1.0)
6767
fastimage (2.1.1)
68-
fastlane (2.80.0)
68+
fastlane (2.89.0)
6969
CFPropertyList (>= 2.3, < 4.0.0)
7070
addressable (>= 2.3, < 3.0.0)
7171
babosa (>= 1.0.2, < 2.0.0)
7272
bundler (>= 1.12.0, < 2.0.0)
7373
colored
74-
commander-fastlane (>= 4.4.5, < 5.0.0)
74+
commander-fastlane (>= 4.4.6, < 5.0.0)
7575
dotenv (>= 2.1.1, < 3.0.0)
7676
excon (>= 0.45.0, < 1.0.0)
7777
faraday (~> 0.9)
7878
faraday-cookie_jar (~> 0.0.6)
7979
faraday_middleware (~> 0.9)
8080
fastimage (>= 2.1.0, < 3.0.0)
81-
gh_inspector (>= 1.0.1, < 2.0.0)
81+
gh_inspector (>= 1.1.2, < 2.0.0)
8282
google-api-client (>= 0.13.1, < 0.14.0)
8383
highline (>= 1.7.2, < 2.0.0)
8484
json (< 3.0.0)
@@ -90,20 +90,21 @@ GEM
9090
public_suffix (~> 2.0.0)
9191
rubyzip (>= 1.1.0, < 2.0.0)
9292
security (= 0.1.3)
93+
simctl (~> 1.6.3)
9394
slack-notifier (>= 2.0.0, < 3.0.0)
9495
terminal-notifier (>= 1.6.2, < 2.0.0)
9596
terminal-table (>= 1.4.5, < 2.0.0)
9697
tty-screen (>= 0.6.3, < 1.0.0)
9798
tty-spinner (>= 0.8.0, < 1.0.0)
9899
word_wrap (~> 1.0.0)
99-
xcodeproj (>= 1.5.2, < 2.0.0)
100+
xcodeproj (>= 1.5.7, < 2.0.0)
100101
xcpretty (>= 0.2.4, < 1.0.0)
101102
xcpretty-travis-formatter (>= 0.0.3)
102103
fastlane-plugin-versioning (0.3.4)
103-
ffi (1.9.21)
104+
ffi (1.9.23)
104105
fourflusher (2.0.1)
105106
fuzzy_match (2.0.4)
106-
gh_inspector (1.1.1)
107+
gh_inspector (1.1.3)
107108
google-api-client (0.13.6)
108109
addressable (~> 2.5, >= 2.5.1)
109110
googleauth (~> 0.5)
@@ -123,7 +124,7 @@ GEM
123124
http-cookie (1.0.3)
124125
domain_name (~> 0.5)
125126
httpclient (2.8.3)
126-
i18n (0.9.3)
127+
i18n (0.9.5)
127128
concurrent-ruby (~> 1.0)
128129
jazzy (0.9.1)
129130
cocoapods (~> 1.0)
@@ -147,19 +148,20 @@ GEM
147148
mime-types-data (3.2016.0521)
148149
mini_magick (4.5.1)
149150
minitest (5.11.3)
150-
molinillo (0.5.7)
151+
molinillo (0.6.5)
151152
multi_json (1.13.1)
152153
multi_xml (0.6.0)
153154
multipart-post (2.0.0)
154155
mustache (0.99.8)
155-
nanaimo (0.2.3)
156+
nanaimo (0.2.4)
156157
nap (1.1.0)
158+
naturally (2.1.0)
157159
netrc (0.11.0)
158160
open4 (1.3.4)
159161
os (0.9.6)
160162
plist (3.4.0)
161163
public_suffix (2.0.5)
162-
rb-fsevent (0.10.2)
164+
rb-fsevent (0.10.3)
163165
rb-inotify (0.9.10)
164166
ffi (>= 0.5.0, < 2)
165167
redcarpet (3.4.0)
@@ -171,7 +173,7 @@ GEM
171173
rouge (2.0.7)
172174
ruby-macho (1.1.0)
173175
rubyzip (1.2.1)
174-
sass (3.5.5)
176+
sass (3.5.6)
175177
sass-listen (~> 4.0.0)
176178
sass-listen (4.0.0)
177179
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -182,6 +184,9 @@ GEM
182184
faraday (~> 0.9)
183185
jwt (>= 1.5, < 3.0)
184186
multi_json (~> 1.10)
187+
simctl (1.6.3)
188+
CFPropertyList
189+
naturally
185190
slack-notifier (2.3.2)
186191
sqlite3 (1.3.13)
187192
terminal-notifier (1.8.0)
@@ -202,12 +207,12 @@ GEM
202207
word_wrap (1.0.0)
203208
xcinvoke (0.3.0)
204209
liferaft (~> 0.0.6)
205-
xcodeproj (1.5.6)
206-
CFPropertyList (~> 2.3.3)
210+
xcodeproj (1.5.7)
211+
CFPropertyList (>= 2.3.3, < 4.0)
207212
atomos (~> 0.1.2)
208213
claide (>= 1.0.2, < 2.0)
209214
colored2 (~> 3.1)
210-
nanaimo (~> 0.2.3)
215+
nanaimo (~> 0.2.4)
211216
xcpretty (0.2.8)
212217
rouge (~> 2.0.7)
213218
xcpretty-travis-formatter (1.0.0)
@@ -217,10 +222,10 @@ PLATFORMS
217222
ruby
218223

219224
DEPENDENCIES
220-
cocoapods (~> 1.2.0)
225+
cocoapods (~> 1.4.0)
221226
fastlane
222227
fastlane-plugin-versioning
223228
jazzy
224229

225230
BUNDLED WITH
226-
1.16.0
231+
1.16.1

‎Sources/Protocols/ValidatorControl.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,12 @@ public protocol ValidatorControl: class, Validatable {
2323
var isValid: Bool { get }
2424
var shouldAllowViolation: Bool { get set }
2525
var validateOnFocusLossOnly: Bool { get set }
26-
weak var validatorDelegate: ValidatorControlDelegate? { get }
26+
27+
28+
/// Delegate for the `ValidatorControl`.
29+
///
30+
/// - Note: We recommend you specify your implementation as `weak`.
31+
var validatorDelegate: ValidatorControlDelegate? { get }
2732

2833
}
2934

‎iOS Example.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@
242242
isa = PBXProject;
243243
attributes = {
244244
LastSwiftUpdateCheck = 0720;
245-
LastUpgradeCheck = 0910;
245+
LastUpgradeCheck = 0930;
246246
ORGANIZATIONNAME = ustwo;
247247
TargetAttributes = {
248248
003698401C4788B1004D1692 = {
@@ -412,12 +412,14 @@
412412
CLANG_WARN_BOOL_CONVERSION = YES;
413413
CLANG_WARN_COMMA = YES;
414414
CLANG_WARN_CONSTANT_CONVERSION = YES;
415+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
415416
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
416417
CLANG_WARN_EMPTY_BODY = YES;
417418
CLANG_WARN_ENUM_CONVERSION = YES;
418419
CLANG_WARN_INFINITE_RECURSION = YES;
419420
CLANG_WARN_INT_CONVERSION = YES;
420421
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
422+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
421423
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
422424
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
423425
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -466,12 +468,14 @@
466468
CLANG_WARN_BOOL_CONVERSION = YES;
467469
CLANG_WARN_COMMA = YES;
468470
CLANG_WARN_CONSTANT_CONVERSION = YES;
471+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
469472
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
470473
CLANG_WARN_EMPTY_BODY = YES;
471474
CLANG_WARN_ENUM_CONVERSION = YES;
472475
CLANG_WARN_INFINITE_RECURSION = YES;
473476
CLANG_WARN_INT_CONVERSION = YES;
474477
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
478+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
475479
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
476480
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
477481
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

0 commit comments

Comments
 (0)