Skip to content

Commit eb6620b

Browse files
authored
Undo xcscheme change to fix CI error (#14399)
1 parent fe4ec87 commit eb6620b

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_IntegrationTests_iOS.xcscheme

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES"
30-
enableAddressSanitizer = "YES"
3130
enableASanStackUseAfterReturn = "YES">
3231
<MacroExpansion>
3332
<BuildableReference
@@ -38,13 +37,6 @@
3837
ReferencedContainer = "container:Firestore.xcodeproj">
3938
</BuildableReference>
4039
</MacroExpansion>
41-
<AdditionalOptions>
42-
<AdditionalOption
43-
key = "NSZombieEnabled"
44-
value = "YES"
45-
isEnabled = "YES">
46-
</AdditionalOption>
47-
</AdditionalOptions>
4840
<Testables>
4941
<TestableReference
5042
skipped = "NO">
@@ -62,7 +54,6 @@
6254
buildConfiguration = "Debug"
6355
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6456
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
65-
enableAddressSanitizer = "YES"
6657
launchStyle = "0"
6758
useCustomWorkingDirectory = "NO"
6859
ignoresPersistentStateOnLaunch = "NO"

Firestore/core/src/nanopb/byte_string.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "Firestore/core/src/nanopb/byte_string.h"
1818

1919
#include <cctype>
20+
// NOLINTNEXTLINE(build/include_order)
2021
#include <cstdlib>
2122
#include <cstring>
2223
#include <iomanip>

Firestore/core/test/unit/nanopb/byte_string_test.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "Firestore/core/src/nanopb/byte_string.h"
1818

1919
#include <cstdint>
20+
// NOLINTNEXTLINE(build/include_order)
2021
#include <cstdlib>
2122

2223
#include "Firestore/core/src/nanopb/nanopb_util.h"

0 commit comments

Comments
 (0)