Skip to content

Commit 7dda9c0

Browse files
echo-branchecho-branch
committed
SDK-479 missed test data files. update for xcode 11
1 parent 5d38160 commit 7dda9c0

File tree

6 files changed

+72
-71
lines changed

6 files changed

+72
-71
lines changed

‎Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@
172172
5F3D671B233062FD00454FF1 /* BNCJsonLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D671A233062FD00454FF1 /* BNCJsonLoader.m */; };
173173
5F3D671C233062FD00454FF1 /* BNCJsonLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F3D671A233062FD00454FF1 /* BNCJsonLoader.m */; };
174174
5F3D671F2330638D00454FF1 /* cpid.json in Resources */ = {isa = PBXBuildFile; fileRef = 5F3D671E2330638D00454FF1 /* cpid.json */; };
175+
5F44AC3E2339474B007A9A7C /* cpid_empty_dev_id.json in Resources */ = {isa = PBXBuildFile; fileRef = 5F44AC3A23394742007A9A7C /* cpid_empty_dev_id.json */; };
176+
5F44AC3F2339474B007A9A7C /* cpid_missing_dev_id.json in Resources */ = {isa = PBXBuildFile; fileRef = 5F44AC3B23394742007A9A7C /* cpid_missing_dev_id.json */; };
175177
5F67F48E228F535500067429 /* BNCEncodingUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F67F48D228F535500067429 /* BNCEncodingUtilsTests.m */; };
176178
5F73FC7E23313F7A000EBD32 /* BNCJSONUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F73FC7C23313F7A000EBD32 /* BNCJSONUtility.h */; };
177179
5F73FC7F23313F7A000EBD32 /* BNCJSONUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F73FC7D23313F7A000EBD32 /* BNCJSONUtility.m */; };
@@ -427,6 +429,8 @@
427429
5F3D6719233062FD00454FF1 /* BNCJsonLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCJsonLoader.h; sourceTree = "<group>"; };
428430
5F3D671A233062FD00454FF1 /* BNCJsonLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCJsonLoader.m; sourceTree = "<group>"; };
429431
5F3D671E2330638D00454FF1 /* cpid.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = cpid.json; sourceTree = "<group>"; };
432+
5F44AC3A23394742007A9A7C /* cpid_empty_dev_id.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = cpid_empty_dev_id.json; sourceTree = "<group>"; };
433+
5F44AC3B23394742007A9A7C /* cpid_missing_dev_id.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = cpid_missing_dev_id.json; sourceTree = "<group>"; };
430434
5F67F48D228F535500067429 /* BNCEncodingUtilsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCEncodingUtilsTests.m; sourceTree = "<group>"; };
431435
5F73FC7C23313F7A000EBD32 /* BNCJSONUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCJSONUtility.h; sourceTree = "<group>"; };
432436
5F73FC7D23313F7A000EBD32 /* BNCJSONUtility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCJSONUtility.m; sourceTree = "<group>"; };
@@ -721,9 +725,11 @@
721725
5F909B612332A56700A774D2 /* cpid_empty_id.json */,
722726
5F909B662332A56700A774D2 /* cpid_empty_past.json */,
723727
5F909B652332A56700A774D2 /* cpid_empty_prob.json */,
728+
5F44AC3A23394742007A9A7C /* cpid_empty_dev_id.json */,
724729
5F909B632332A56700A774D2 /* cpid_missing_id.json */,
725730
5F909B622332A56700A774D2 /* cpid_missing_past.json */,
726731
5F909B642332A56700A774D2 /* cpid_missing_prob.json */,
732+
5F44AC3B23394742007A9A7C /* cpid_missing_dev_id.json */,
727733
5F909B762332C0B800A774D2 /* latd.json */,
728734
5F909B752332C0B800A774D2 /* latd_empty_data.json */,
729735
5F909B732332C0B700A774D2 /* latd_missing_data.json */,
@@ -1110,7 +1116,7 @@
11101116
isa = PBXProject;
11111117
attributes = {
11121118
CLASSPREFIX = BNC;
1113-
LastUpgradeCheck = 1030;
1119+
LastUpgradeCheck = 1100;
11141120
ORGANIZATIONNAME = "Branch, Inc.";
11151121
TargetAttributes = {
11161122
466B58371B17773000A69EDE = {
@@ -1193,11 +1199,13 @@
11931199
isa = PBXResourcesBuildPhase;
11941200
buildActionMask = 2147483647;
11951201
files = (
1202+
5F44AC3E2339474B007A9A7C /* cpid_empty_dev_id.json in Resources */,
11961203
5F909B792332C0B800A774D2 /* latd_empty_data.json in Resources */,
11971204
5F909B692332A56C00A774D2 /* cpid_empty_prob.json in Resources */,
11981205
5F909B682332A56C00A774D2 /* cpid_empty_past.json in Resources */,
11991206
5F909B672332A56C00A774D2 /* cpid_empty_id.json in Resources */,
12001207
4D7881FD209CF2D4002B750F /* BNCTestCase.strings in Resources */,
1208+
5F44AC3F2339474B007A9A7C /* cpid_missing_dev_id.json in Resources */,
12011209
5F3D671F2330638D00454FF1 /* cpid.json in Resources */,
12021210
5F909B772332C0B800A774D2 /* latd_missing_data.json in Resources */,
12031211
5F909B6A2332A56C00A774D2 /* cpid_missing_id.json in Resources */,

‎Branch-TestBed/Branch-TestBed.xcodeproj/xcshareddata/xcschemes/Branch-SDK-Tests.xcscheme‎

Lines changed: 19 additions & 19 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 = "1030"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,25 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
2930
enableThreadSanitizer = "YES"
30-
codeCoverageEnabled = "YES"
31-
shouldUseLaunchSchemeArgsEnv = "YES">
31+
codeCoverageEnabled = "YES">
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "7E6B3B501AA42D0E005F45BF"
36+
BuildableName = "Branch-SDK-Tests.xctest"
37+
BlueprintName = "Branch-SDK-Tests"
38+
ReferencedContainer = "container:Branch-TestBed.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
<AdditionalOption
43+
key = "NSZombieEnabled"
44+
value = "YES"
45+
isEnabled = "YES">
46+
</AdditionalOption>
47+
</AdditionalOptions>
3248
<Testables>
3349
<TestableReference
3450
skipped = "NO">
@@ -61,22 +77,6 @@
6177
</SkippedTests>
6278
</TestableReference>
6379
</Testables>
64-
<MacroExpansion>
65-
<BuildableReference
66-
BuildableIdentifier = "primary"
67-
BlueprintIdentifier = "7E6B3B501AA42D0E005F45BF"
68-
BuildableName = "Branch-SDK-Tests.xctest"
69-
BlueprintName = "Branch-SDK-Tests"
70-
ReferencedContainer = "container:Branch-TestBed.xcodeproj">
71-
</BuildableReference>
72-
</MacroExpansion>
73-
<AdditionalOptions>
74-
<AdditionalOption
75-
key = "NSZombieEnabled"
76-
value = "YES"
77-
isEnabled = "YES">
78-
</AdditionalOption>
79-
</AdditionalOptions>
8080
</TestAction>
8181
<LaunchAction
8282
buildConfiguration = "Debug"

‎Branch-TestBed/Branch-TestBed.xcodeproj/xcshareddata/xcschemes/Branch-SDK-Unhosted-Tests.xcscheme‎

Lines changed: 1 addition & 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 = "1030"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -23,8 +23,6 @@
2323
</BuildableReference>
2424
</TestableReference>
2525
</Testables>
26-
<AdditionalOptions>
27-
</AdditionalOptions>
2826
</TestAction>
2927
<LaunchAction
3028
buildConfiguration = "Debug"
@@ -36,8 +34,6 @@
3634
debugDocumentVersioning = "YES"
3735
debugServiceExtension = "internal"
3836
allowLocationSimulation = "YES">
39-
<AdditionalOptions>
40-
</AdditionalOptions>
4137
</LaunchAction>
4238
<ProfileAction
4339
buildConfiguration = "Release"

‎Branch-TestBed/Branch-TestBed.xcodeproj/xcshareddata/xcschemes/Branch-TestBed.xcscheme‎

Lines changed: 27 additions & 28 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 = "1030"
3+
LastUpgradeVersion = "1100"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,10 +40,33 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "NO"
4344
enableThreadSanitizer = "YES"
4445
enableUBSanitizer = "YES"
45-
codeCoverageEnabled = "YES"
46-
shouldUseLaunchSchemeArgsEnv = "NO">
46+
codeCoverageEnabled = "YES">
47+
<MacroExpansion>
48+
<BuildableReference
49+
BuildableIdentifier = "primary"
50+
BlueprintIdentifier = "6700165F1940F51400A9E103"
51+
BuildableName = "Branch-TestBed.app"
52+
BlueprintName = "Branch-TestBed"
53+
ReferencedContainer = "container:Branch-TestBed.xcodeproj">
54+
</BuildableReference>
55+
</MacroExpansion>
56+
<EnvironmentVariables>
57+
<EnvironmentVariable
58+
key = "BNCTestBreakpoints"
59+
value = "0"
60+
isEnabled = "YES">
61+
</EnvironmentVariable>
62+
</EnvironmentVariables>
63+
<AdditionalOptions>
64+
<AdditionalOption
65+
key = "NSZombieEnabled"
66+
value = "YES"
67+
isEnabled = "YES">
68+
</AdditionalOption>
69+
</AdditionalOptions>
4770
<Testables>
4871
<TestableReference
4972
skipped = "NO">
@@ -69,29 +92,6 @@
6992
</BuildableReference>
7093
</TestableReference>
7194
</Testables>
72-
<MacroExpansion>
73-
<BuildableReference
74-
BuildableIdentifier = "primary"
75-
BlueprintIdentifier = "6700165F1940F51400A9E103"
76-
BuildableName = "Branch-TestBed.app"
77-
BlueprintName = "Branch-TestBed"
78-
ReferencedContainer = "container:Branch-TestBed.xcodeproj">
79-
</BuildableReference>
80-
</MacroExpansion>
81-
<EnvironmentVariables>
82-
<EnvironmentVariable
83-
key = "BNCTestBreakpoints"
84-
value = "0"
85-
isEnabled = "YES">
86-
</EnvironmentVariable>
87-
</EnvironmentVariables>
88-
<AdditionalOptions>
89-
<AdditionalOption
90-
key = "NSZombieEnabled"
91-
value = "YES"
92-
isEnabled = "YES">
93-
</AdditionalOption>
94-
</AdditionalOptions>
9595
</TestAction>
9696
<LaunchAction
9797
buildConfiguration = "Debug"
@@ -105,6 +105,7 @@
105105
ignoresPersistentStateOnLaunch = "NO"
106106
debugDocumentVersioning = "YES"
107107
stopOnEveryThreadSanitizerIssue = "YES"
108+
migratedStopOnEveryIssue = "YES"
108109
debugServiceExtension = "internal"
109110
allowLocationSimulation = "YES">
110111
<BuildableProductRunnable
@@ -124,8 +125,6 @@
124125
isEnabled = "NO">
125126
</EnvironmentVariable>
126127
</EnvironmentVariables>
127-
<AdditionalOptions>
128-
</AdditionalOptions>
129128
<LocationScenarioReference
130129
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
131130
referenceType = "1">

‎Branch-TestBed/Branch-TestBed.xcodeproj/xcshareddata/xcschemes/Branch.xcscheme‎

Lines changed: 15 additions & 17 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 = "1030"
3+
LastUpgradeVersion = "1100"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,22 +26,10 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
2930
enableThreadSanitizer = "YES"
3031
enableUBSanitizer = "YES"
31-
codeCoverageEnabled = "YES"
32-
shouldUseLaunchSchemeArgsEnv = "YES">
33-
<Testables>
34-
<TestableReference
35-
skipped = "NO">
36-
<BuildableReference
37-
BuildableIdentifier = "primary"
38-
BlueprintIdentifier = "7E6B3B501AA42D0E005F45BF"
39-
BuildableName = "Branch-SDK-Tests.xctest"
40-
BlueprintName = "Branch-SDK-Tests"
41-
ReferencedContainer = "container:Branch-TestBed.xcodeproj">
42-
</BuildableReference>
43-
</TestableReference>
44-
</Testables>
32+
codeCoverageEnabled = "YES">
4533
<MacroExpansion>
4634
<BuildableReference
4735
BuildableIdentifier = "primary"
@@ -58,6 +46,18 @@
5846
isEnabled = "YES">
5947
</AdditionalOption>
6048
</AdditionalOptions>
49+
<Testables>
50+
<TestableReference
51+
skipped = "NO">
52+
<BuildableReference
53+
BuildableIdentifier = "primary"
54+
BlueprintIdentifier = "7E6B3B501AA42D0E005F45BF"
55+
BuildableName = "Branch-SDK-Tests.xctest"
56+
BlueprintName = "Branch-SDK-Tests"
57+
ReferencedContainer = "container:Branch-TestBed.xcodeproj">
58+
</BuildableReference>
59+
</TestableReference>
60+
</Testables>
6161
</TestAction>
6262
<LaunchAction
6363
buildConfiguration = "Debug"
@@ -78,8 +78,6 @@
7878
ReferencedContainer = "container:Branch-TestBed.xcodeproj">
7979
</BuildableReference>
8080
</MacroExpansion>
81-
<AdditionalOptions>
82-
</AdditionalOptions>
8381
</LaunchAction>
8482
<ProfileAction
8583
buildConfiguration = "Release"

‎Branch-TestBed/Branch-TestBed.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<plist version="1.0">
44
<dict>
55
<key>BuildSystemType</key>
6-
<string>Original</string>
6+
<string>Latest</string>
77
</dict>
88
</plist>

0 commit comments

Comments
 (0)