Skip to content

Commit a6e401b

Browse files
morganchen12morganchen12
committed
fix runpath error in UI tests
Change-Id: I36d2b16976bf90f671de515832b9c72e4a4bd32f
1 parent 5e6607e commit a6e401b

9 files changed

+54
-35
lines changed

‎FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,8 @@
514514
8D3A120D1DC2B122007558BA /* FUISortedArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUISortedArray.m; sourceTree = "<group>"; };
515515
8D4B6BBE1F69EB2900C4A14B /* FUIFirestoreTableViewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIFirestoreTableViewDataSource.h; sourceTree = "<group>"; };
516516
8D4B6BBF1F69EB2900C4A14B /* FUIFirestoreTableViewDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIFirestoreTableViewDataSource.m; sourceTree = "<group>"; };
517+
8D5247E1200435D300575A46 /* TwitterCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TwitterCore.framework; path = Pods/TwitterCore/iOS/TwitterCore.framework; sourceTree = "<group>"; };
518+
8D5247E3200435FB00575A46 /* TwitterKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TwitterKit.framework; path = Pods/TwitterKit/iOS/TwitterKit.framework; sourceTree = "<group>"; };
517519
8D559D411F68A7F100CE9D8A /* FirebaseFirestoreUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseFirestoreUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
518520
8D559D431F68A7F100CE9D8A /* FirebaseFirestoreUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseFirestoreUI.h; sourceTree = "<group>"; };
519521
8D559D441F68A7F100CE9D8A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1761,6 +1763,8 @@
17611763
903F73EA092681D67581F496 /* Frameworks */ = {
17621764
isa = PBXGroup;
17631765
children = (
1766+
8D5247E3200435FB00575A46 /* TwitterKit.framework */,
1767+
8D5247E1200435D300575A46 /* TwitterCore.framework */,
17641768
8DCF7AD31DC009C1004E19CA /* GTMOAuth2.framework */,
17651769
);
17661770
name = Frameworks;
@@ -2609,7 +2613,7 @@
26092613
8D2A849D1D678B2B0058DF04 /* Project object */ = {
26102614
isa = PBXProject;
26112615
attributes = {
2612-
LastUpgradeCheck = 0830;
2616+
LastUpgradeCheck = 0900;
26132617
ORGANIZATIONNAME = FirebaseUI;
26142618
TargetAttributes = {
26152619
8D2A84A51D678B2B0058DF04 = {
@@ -4014,7 +4018,9 @@
40144018
CLANG_ENABLE_MODULES = YES;
40154019
CLANG_ENABLE_OBJC_ARC = YES;
40164020
CLANG_WARN_ASSIGN_ENUM = YES;
4021+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
40174022
CLANG_WARN_BOOL_CONVERSION = YES;
4023+
CLANG_WARN_COMMA = YES;
40184024
CLANG_WARN_CONSTANT_CONVERSION = YES;
40194025
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
40204026
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -4023,6 +4029,8 @@
40234029
CLANG_WARN_INFINITE_RECURSION = YES;
40244030
CLANG_WARN_INT_CONVERSION = YES;
40254031
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
4032+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
4033+
CLANG_WARN_STRICT_PROTOTYPES = YES;
40264034
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
40274035
CLANG_WARN_SUSPICIOUS_MOVE = YES;
40284036
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -4071,7 +4079,9 @@
40714079
CLANG_ENABLE_MODULES = YES;
40724080
CLANG_ENABLE_OBJC_ARC = YES;
40734081
CLANG_WARN_ASSIGN_ENUM = YES;
4082+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
40744083
CLANG_WARN_BOOL_CONVERSION = YES;
4084+
CLANG_WARN_COMMA = YES;
40754085
CLANG_WARN_CONSTANT_CONVERSION = YES;
40764086
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
40774087
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
@@ -4080,6 +4090,8 @@
40804090
CLANG_WARN_INFINITE_RECURSION = YES;
40814091
CLANG_WARN_INT_CONVERSION = YES;
40824092
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
4093+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
4094+
CLANG_WARN_STRICT_PROTOTYPES = YES;
40834095
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
40844096
CLANG_WARN_SUSPICIOUS_MOVE = YES;
40854097
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -5131,12 +5143,12 @@
51315143
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
51325144
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
51335145
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
5134-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework",
5135-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core",
5146+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
5147+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core\"",
51365148
);
51375149
INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist;
51385150
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
5139-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @rpath \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\" \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core\"";
5151+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @rpath \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\" \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core\" \"$(PODS_ROOT)/TwitterKit/iOS\" \"$(PODS_ROOT)/TwitterCore/iOS\"";
51405152
OTHER_LDFLAGS = (
51415153
"$(inherited)",
51425154
"-ObjC",
@@ -5194,10 +5206,6 @@
51945206
"-framework",
51955207
"\"SystemConfiguration\"",
51965208
"-framework",
5197-
"\"TwitterCore\"",
5198-
"-framework",
5199-
"\"TwitterKit\"",
5200-
"-framework",
52015209
"\"UIKit\"",
52025210
"-weak_framework",
52035211
"\"Accounts\"",
@@ -5235,12 +5243,12 @@
52355243
"\"${PODS_ROOT}/FirebaseCore/Frameworks\"",
52365244
"\"${PODS_ROOT}/FirebaseAuth/Frameworks\"",
52375245
"\"${PODS_ROOT}/FirebaseInstanceID/Frameworks\"",
5238-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework",
5239-
"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core",
5246+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\"",
5247+
"\"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core\"",
52405248
);
52415249
INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist;
52425250
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
5243-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @rpath \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\" \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core\"";
5251+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @rpath \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMOAuth2-framework\" \"$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher-Core\" \"$(PODS_ROOT)/TwitterKit/iOS\" \"$(PODS_ROOT)/TwitterCore/iOS\"";
52445252
OTHER_LDFLAGS = (
52455253
"$(inherited)",
52465254
"-ObjC",
@@ -5298,10 +5306,6 @@
52985306
"-framework",
52995307
"\"SystemConfiguration\"",
53005308
"-framework",
5301-
"\"TwitterCore\"",
5302-
"-framework",
5303-
"\"TwitterKit\"",
5304-
"-framework",
53055309
"\"UIKit\"",
53065310
"-weak_framework",
53075311
"\"Accounts\"",

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseAuthUI.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseDatabaseUI.xcscheme

Lines changed: 5 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,9 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
enableAddressSanitizer = "YES">
29+
enableAddressSanitizer = "YES"
30+
language = ""
31+
shouldUseLaunchSchemeArgsEnv = "YES">
3132
<Testables>
3233
<TestableReference
3334
skipped = "NO">
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseFacebookAuthUI.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseGoogleAuthUI.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseStorageUI.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseTwitterAuthUI.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseUI.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -126,6 +127,7 @@
126127
buildConfiguration = "Release"
127128
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
128129
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
130+
language = ""
129131
launchStyle = "0"
130132
useCustomWorkingDirectory = "NO"
131133
ignoresPersistentStateOnLaunch = "NO"

‎FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseUISample.xcscheme

Lines changed: 12 additions & 11 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -39,7 +40,7 @@
3940
</BuildableReference>
4041
</TestableReference>
4142
<TestableReference
42-
skipped = "NO">
43+
skipped = "YES">
4344
<BuildableReference
4445
BuildableIdentifier = "primary"
4546
BlueprintIdentifier = "8DCC4FE51D678CE800B0D3C4"
@@ -49,7 +50,7 @@
4950
</BuildableReference>
5051
</TestableReference>
5152
<TestableReference
52-
skipped = "NO">
53+
skipped = "YES">
5354
<BuildableReference
5455
BuildableIdentifier = "primary"
5556
BlueprintIdentifier = "8DCC4FAD1D678CC400B0D3C4"
@@ -59,7 +60,7 @@
5960
</BuildableReference>
6061
</TestableReference>
6162
<TestableReference
62-
skipped = "NO">
63+
skipped = "YES">
6364
<BuildableReference
6465
BuildableIdentifier = "primary"
6566
BlueprintIdentifier = "C3773B5B1E8EFDEA00ACF58C"
@@ -69,7 +70,7 @@
6970
</BuildableReference>
7071
</TestableReference>
7172
<TestableReference
72-
skipped = "NO">
73+
skipped = "YES">
7374
<BuildableReference
7475
BuildableIdentifier = "primary"
7576
BlueprintIdentifier = "8D9084351D9316AB00333CC8"
@@ -79,7 +80,7 @@
7980
</BuildableReference>
8081
</TestableReference>
8182
<TestableReference
82-
skipped = "NO">
83+
skipped = "YES">
8384
<BuildableReference
8485
BuildableIdentifier = "primary"
8586
BlueprintIdentifier = "8DCC50011D678CF500B0D3C4"
@@ -89,7 +90,7 @@
8990
</BuildableReference>
9091
</TestableReference>
9192
<TestableReference
92-
skipped = "NO">
93+
skipped = "YES">
9394
<BuildableReference
9495
BuildableIdentifier = "primary"
9596
BlueprintIdentifier = "C325169A1D88A54C00B0B3F9"
@@ -99,7 +100,7 @@
99100
</BuildableReference>
100101
</TestableReference>
101102
<TestableReference
102-
skipped = "NO">
103+
skipped = "YES">
103104
<BuildableReference
104105
BuildableIdentifier = "primary"
105106
BlueprintIdentifier = "8DCC4FC91D678CDC00B0D3C4"
@@ -125,14 +126,14 @@
125126
buildConfiguration = "Debug"
126127
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
127128
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
129+
language = "en"
130+
region = "US"
128131
launchStyle = "0"
129132
useCustomWorkingDirectory = "NO"
130133
ignoresPersistentStateOnLaunch = "NO"
131134
debugDocumentVersioning = "YES"
132135
debugServiceExtension = "internal"
133-
allowLocationSimulation = "YES"
134-
language = "en"
135-
region = "US">
136+
allowLocationSimulation = "YES">
136137
<BuildableProductRunnable
137138
runnableDebuggingMode = "0">
138139
<BuildableReference

0 commit comments

Comments
 (0)