Skip to content

Commit 50bce78

Browse files
kellyroach-optimizelykellyroach-optimizely
authored
Kroach/oasis 2442 xcode94 (#254)
* Update Project Settings to Xcode 9.4 recommended settings * Add ', strong, nonnull' to anonymizeIP @Property * Accept Xcode 9.4's recommended Fix's which add 'self->' * Eliminate Xcode Aanalyze warning for line in OPTLYFMDBDatabase.m * Add weakSelf and strongSelf to setupNetworkTimer: * setupNetworkTimer: nit
1 parent 390856e commit 50bce78

File tree

33 files changed

+104
-90
lines changed

33 files changed

+104
-90
lines changed

‎OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
isa = PBXProject;
391391
attributes = {
392392
LastSwiftUpdateCheck = 0810;
393-
LastUpgradeCheck = 0900;
393+
LastUpgradeCheck = 0940;
394394
ORGANIZATIONNAME = Optimizely;
395395
TargetAttributes = {
396396
EA7000001E552EBD00590BEF = {
@@ -684,13 +684,15 @@
684684
CLANG_WARN_BOOL_CONVERSION = YES;
685685
CLANG_WARN_COMMA = YES;
686686
CLANG_WARN_CONSTANT_CONVERSION = YES;
687+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
687688
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
688689
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
689690
CLANG_WARN_EMPTY_BODY = YES;
690691
CLANG_WARN_ENUM_CONVERSION = YES;
691692
CLANG_WARN_INFINITE_RECURSION = YES;
692693
CLANG_WARN_INT_CONVERSION = YES;
693694
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
695+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
694696
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
695697
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
696698
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -747,13 +749,15 @@
747749
CLANG_WARN_BOOL_CONVERSION = YES;
748750
CLANG_WARN_COMMA = YES;
749751
CLANG_WARN_CONSTANT_CONVERSION = YES;
752+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
750753
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
751754
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
752755
CLANG_WARN_EMPTY_BODY = YES;
753756
CLANG_WARN_ENUM_CONVERSION = YES;
754757
CLANG_WARN_INFINITE_RECURSION = YES;
755758
CLANG_WARN_INT_CONVERSION = YES;
756759
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
760+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
757761
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
758762
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
759763
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyTVOSDemoApp.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 = "0920"
3+
LastUpgradeVersion = "0940"
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
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎OptimizelyDemoApp/OptimizelyDemoApp.xcodeproj/xcshareddata/xcschemes/OptimizelyiOSDemoApp.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 = "0920"
3+
LastUpgradeVersion = "0940"
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
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎OptimizelySDK.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>

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@
14981498
EA3C67FC1DC1E66C00C578CA /* Project object */ = {
14991499
isa = PBXProject;
15001500
attributes = {
1501-
LastUpgradeCheck = 0920;
1501+
LastUpgradeCheck = 0940;
15021502
ORGANIZATIONNAME = Optimizely;
15031503
TargetAttributes = {
15041504
3E99A9F21F4BAF9A009F8805 = {
@@ -2150,12 +2150,14 @@
21502150
CLANG_WARN_BOOL_CONVERSION = YES;
21512151
CLANG_WARN_COMMA = YES;
21522152
CLANG_WARN_CONSTANT_CONVERSION = YES;
2153+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
21532154
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
21542155
CLANG_WARN_EMPTY_BODY = YES;
21552156
CLANG_WARN_ENUM_CONVERSION = YES;
21562157
CLANG_WARN_INFINITE_RECURSION = YES;
21572158
CLANG_WARN_INT_CONVERSION = YES;
21582159
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2160+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
21592161
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
21602162
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
21612163
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -2420,12 +2422,14 @@
24202422
CLANG_WARN_BOOL_CONVERSION = YES;
24212423
CLANG_WARN_COMMA = YES;
24222424
CLANG_WARN_CONSTANT_CONVERSION = YES;
2425+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
24232426
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
24242427
CLANG_WARN_EMPTY_BODY = YES;
24252428
CLANG_WARN_ENUM_CONVERSION = YES;
24262429
CLANG_WARN_INFINITE_RECURSION = YES;
24272430
CLANG_WARN_INT_CONVERSION = YES;
24282431
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
2432+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
24292433
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
24302434
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
24312435
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/xcshareddata/xcschemes/OptimizelySDKCoreTVOS.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 = "0920"
3+
LastUpgradeVersion = "0940"
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
@@ -66,7 +65,6 @@
6665
buildConfiguration = "Debug"
6766
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6867
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69-
language = ""
7068
launchStyle = "0"
7169
useCustomWorkingDirectory = "NO"
7270
ignoresPersistentStateOnLaunch = "NO"

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/xcshareddata/xcschemes/OptimizelySDKCoreiOS.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 = "0920"
3+
LastUpgradeVersion = "0940"
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">
@@ -67,7 +66,6 @@
6766
buildConfiguration = "Debug"
6867
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6968
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
70-
language = ""
7169
launchStyle = "0"
7270
useCustomWorkingDirectory = "NO"
7371
ignoresPersistentStateOnLaunch = "NO"

‎OptimizelySDKCore/OptimizelySDKCore/OPTLYProjectConfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_END
4545
/// Datafile Revision number
4646
@property (nonatomic, strong, nonnull) NSString *revision;
4747
/// Flag for IP anonymization
48-
@property (nonatomic) NSNumber<Optional> *anonymizeIP;
48+
@property (nonatomic, strong, nonnull) NSNumber<Optional> *anonymizeIP;
4949
/// List of Optimizely Experiment objects
5050
@property (nonatomic, strong, nonnull) NSArray<OPTLYExperiment> *experiments;
5151
/// List of Optimizely Event Type objects

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
EA3C68B21DC1E75800C578CA /* Project object */ = {
444444
isa = PBXProject;
445445
attributes = {
446-
LastUpgradeCheck = 0900;
446+
LastUpgradeCheck = 0940;
447447
ORGANIZATIONNAME = Optimizely;
448448
TargetAttributes = {
449449
EA5248031DC72AAF00AF6685 = {
@@ -793,12 +793,14 @@
793793
CLANG_WARN_BOOL_CONVERSION = YES;
794794
CLANG_WARN_COMMA = YES;
795795
CLANG_WARN_CONSTANT_CONVERSION = YES;
796+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
796797
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
797798
CLANG_WARN_EMPTY_BODY = YES;
798799
CLANG_WARN_ENUM_CONVERSION = YES;
799800
CLANG_WARN_INFINITE_RECURSION = YES;
800801
CLANG_WARN_INT_CONVERSION = YES;
801802
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
803+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
802804
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
803805
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
804806
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -857,12 +859,14 @@
857859
CLANG_WARN_BOOL_CONVERSION = YES;
858860
CLANG_WARN_COMMA = YES;
859861
CLANG_WARN_CONSTANT_CONVERSION = YES;
862+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
860863
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
861864
CLANG_WARN_EMPTY_BODY = YES;
862865
CLANG_WARN_ENUM_CONVERSION = YES;
863866
CLANG_WARN_INFINITE_RECURSION = YES;
864867
CLANG_WARN_INT_CONVERSION = YES;
865868
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
869+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
866870
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
867871
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
868872
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/xcshareddata/xcschemes/OptimizelySDKDatafileManagerTVOS.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 = "0920"
3+
LastUpgradeVersion = "0940"
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
@@ -86,7 +85,6 @@
8685
buildConfiguration = "Debug"
8786
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
8887
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
89-
language = ""
9088
launchStyle = "0"
9189
useCustomWorkingDirectory = "NO"
9290
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)