Skip to content

Commit 68842f1

Browse files
dreampiggydreampiggy
committed
Merge branch 'master' of https://github.com/firebase/FirebaseUI-iOS into refactory_storage_sdwebimage_binding_5_api
# Conflicts: # FirebaseUI.podspec
2 parents d436ab6 + e153e27 commit 68842f1

File tree

29 files changed

+928
-75
lines changed

29 files changed

+928
-75
lines changed

‎AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
1EF5CA884792B6ABAF0C7EC8 /* Pods_FirebaseAnonymousAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */; };
1011
8D69E22721DD476D00CFA49B /* FirebaseAnonymousAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E21D21DD476C00CFA49B /* FirebaseAnonymousAuthUI.framework */; };
1112
8D69E22C21DD476D00CFA49B /* FirebaseAnonymousAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E22B21DD476D00CFA49B /* FirebaseAnonymousAuthUITests.m */; };
1213
8D69E22E21DD476D00CFA49B /* FirebaseAnonymousAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -16,6 +17,7 @@
1617
8D69E35421DD5C4700CFA49B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E34E21DD5C4700CFA49B /* [email protected] */; };
1718
8D69E35521DD5C4700CFA49B /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E34F21DD5C4700CFA49B /* [email protected] */; };
1819
8D69E35621DD5C4700CFA49B /* FirebaseAnonymousAuthUI.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E35121DD5C4700CFA49B /* FirebaseAnonymousAuthUI.strings */; };
20+
FCB1B2C40B18B4A62D63C4E4 /* Pods_FirebaseAnonymousAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */; };
1921
/* End PBXBuildFile section */
2022

2123
/* Begin PBXContainerItemProxy section */
@@ -29,6 +31,8 @@
2931
/* End PBXContainerItemProxy section */
3032

3133
/* Begin PBXFileReference section */
34+
02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests.release.xcconfig"; sourceTree = "<group>"; };
35+
73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAnonymousAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3236
8D69E21D21DD476C00CFA49B /* FirebaseAnonymousAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseAnonymousAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3337
8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseAnonymousAuthUI.h; sourceTree = "<group>"; };
3438
8D69E22121DD476D00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -41,13 +45,18 @@
4145
8D69E34E21DD5C4700CFA49B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
4246
8D69E34F21DD5C4700CFA49B /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
4347
8D69E35221DD5C4700CFA49B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/FirebaseAnonymousAuthUI.strings; sourceTree = "<group>"; };
48+
9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI.release.xcconfig"; sourceTree = "<group>"; };
49+
9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAnonymousAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
50+
AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI.debug.xcconfig"; sourceTree = "<group>"; };
51+
C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests.debug.xcconfig"; sourceTree = "<group>"; };
4452
/* End PBXFileReference section */
4553

4654
/* Begin PBXFrameworksBuildPhase section */
4755
8D69E21A21DD476C00CFA49B /* Frameworks */ = {
4856
isa = PBXFrameworksBuildPhase;
4957
buildActionMask = 2147483647;
5058
files = (
59+
FCB1B2C40B18B4A62D63C4E4 /* Pods_FirebaseAnonymousAuthUI.framework in Frameworks */,
5160
);
5261
runOnlyForDeploymentPostprocessing = 0;
5362
};
@@ -56,6 +65,7 @@
5665
buildActionMask = 2147483647;
5766
files = (
5867
8D69E22721DD476D00CFA49B /* FirebaseAnonymousAuthUI.framework in Frameworks */,
68+
1EF5CA884792B6ABAF0C7EC8 /* Pods_FirebaseAnonymousAuthUITests.framework in Frameworks */,
5969
);
6070
runOnlyForDeploymentPostprocessing = 0;
6171
};
@@ -68,6 +78,8 @@
6878
8D69E21F21DD476C00CFA49B /* FirebaseAnonymousAuthUI */,
6979
8D69E22A21DD476D00CFA49B /* FirebaseAnonymousAuthUITests */,
7080
8D69E21E21DD476C00CFA49B /* Products */,
81+
B55605365FE042830EBBD157 /* Pods */,
82+
B3C0D2E787876EE649C89CBF /* Frameworks */,
7183
);
7284
sourceTree = "<group>";
7385
};
@@ -120,6 +132,27 @@
120132
path = Strings;
121133
sourceTree = "<group>";
122134
};
135+
B3C0D2E787876EE649C89CBF /* Frameworks */ = {
136+
isa = PBXGroup;
137+
children = (
138+
73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */,
139+
9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */,
140+
);
141+
name = Frameworks;
142+
sourceTree = "<group>";
143+
};
144+
B55605365FE042830EBBD157 /* Pods */ = {
145+
isa = PBXGroup;
146+
children = (
147+
AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */,
148+
9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */,
149+
C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */,
150+
02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */,
151+
);
152+
name = Pods;
153+
path = Pods;
154+
sourceTree = "<group>";
155+
};
123156
/* End PBXGroup section */
124157

125158
/* Begin PBXHeadersBuildPhase section */
@@ -139,10 +172,12 @@
139172
isa = PBXNativeTarget;
140173
buildConfigurationList = 8D69E23121DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAnonymousAuthUI" */;
141174
buildPhases = (
175+
F0D2BEDEEF9C146EA083E17F /* [CP] Check Pods Manifest.lock */,
142176
8D69E21821DD476C00CFA49B /* Headers */,
143177
8D69E21921DD476C00CFA49B /* Sources */,
144178
8D69E21A21DD476C00CFA49B /* Frameworks */,
145179
8D69E21B21DD476C00CFA49B /* Resources */,
180+
65BB97B1C2E0ACB0370C903B /* [CP] Copy Pods Resources */,
146181
);
147182
buildRules = (
148183
);
@@ -157,9 +192,11 @@
157192
isa = PBXNativeTarget;
158193
buildConfigurationList = 8D69E23421DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAnonymousAuthUITests" */;
159194
buildPhases = (
195+
714F08D4612B91126DDD4559 /* [CP] Check Pods Manifest.lock */,
160196
8D69E22221DD476D00CFA49B /* Sources */,
161197
8D69E22321DD476D00CFA49B /* Frameworks */,
162198
8D69E22421DD476D00CFA49B /* Resources */,
199+
870284F7293CA07BAECE0B41 /* [CP] Embed Pods Frameworks */,
163200
);
164201
buildRules = (
165202
);
@@ -227,6 +264,97 @@
227264
};
228265
/* End PBXResourcesBuildPhase section */
229266

267+
/* Begin PBXShellScriptBuildPhase section */
268+
65BB97B1C2E0ACB0370C903B /* [CP] Copy Pods Resources */ = {
269+
isa = PBXShellScriptBuildPhase;
270+
buildActionMask = 2147483647;
271+
files = (
272+
);
273+
inputFileListPaths = (
274+
);
275+
inputPaths = (
276+
"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI-resources.sh",
277+
"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle",
278+
);
279+
name = "[CP] Copy Pods Resources";
280+
outputFileListPaths = (
281+
);
282+
outputPaths = (
283+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle",
284+
);
285+
runOnlyForDeploymentPostprocessing = 0;
286+
shellPath = /bin/sh;
287+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI-resources.sh\"\n";
288+
showEnvVarsInLog = 0;
289+
};
290+
714F08D4612B91126DDD4559 /* [CP] Check Pods Manifest.lock */ = {
291+
isa = PBXShellScriptBuildPhase;
292+
buildActionMask = 2147483647;
293+
files = (
294+
);
295+
inputFileListPaths = (
296+
);
297+
inputPaths = (
298+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
299+
"${PODS_ROOT}/Manifest.lock",
300+
);
301+
name = "[CP] Check Pods Manifest.lock";
302+
outputFileListPaths = (
303+
);
304+
outputPaths = (
305+
"$(DERIVED_FILE_DIR)/Pods-FirebaseAnonymousAuthUITests-checkManifestLockResult.txt",
306+
);
307+
runOnlyForDeploymentPostprocessing = 0;
308+
shellPath = /bin/sh;
309+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
310+
showEnvVarsInLog = 0;
311+
};
312+
870284F7293CA07BAECE0B41 /* [CP] Embed Pods Frameworks */ = {
313+
isa = PBXShellScriptBuildPhase;
314+
buildActionMask = 2147483647;
315+
files = (
316+
);
317+
inputFileListPaths = (
318+
);
319+
inputPaths = (
320+
"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests-frameworks.sh",
321+
"${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework",
322+
);
323+
name = "[CP] Embed Pods Frameworks";
324+
outputFileListPaths = (
325+
);
326+
outputPaths = (
327+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework",
328+
);
329+
runOnlyForDeploymentPostprocessing = 0;
330+
shellPath = /bin/sh;
331+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests-frameworks.sh\"\n";
332+
showEnvVarsInLog = 0;
333+
};
334+
F0D2BEDEEF9C146EA083E17F /* [CP] Check Pods Manifest.lock */ = {
335+
isa = PBXShellScriptBuildPhase;
336+
buildActionMask = 2147483647;
337+
files = (
338+
);
339+
inputFileListPaths = (
340+
);
341+
inputPaths = (
342+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
343+
"${PODS_ROOT}/Manifest.lock",
344+
);
345+
name = "[CP] Check Pods Manifest.lock";
346+
outputFileListPaths = (
347+
);
348+
outputPaths = (
349+
"$(DERIVED_FILE_DIR)/Pods-FirebaseAnonymousAuthUI-checkManifestLockResult.txt",
350+
);
351+
runOnlyForDeploymentPostprocessing = 0;
352+
shellPath = /bin/sh;
353+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
354+
showEnvVarsInLog = 0;
355+
};
356+
/* End PBXShellScriptBuildPhase section */
357+
230358
/* Begin PBXSourcesBuildPhase section */
231359
8D69E21921DD476C00CFA49B /* Sources */ = {
232360
isa = PBXSourcesBuildPhase;
@@ -386,6 +514,7 @@
386514
};
387515
8D69E23221DD476D00CFA49B /* Debug */ = {
388516
isa = XCBuildConfiguration;
517+
baseConfigurationReference = AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */;
389518
buildSettings = {
390519
CODE_SIGN_IDENTITY = "";
391520
CODE_SIGN_STYLE = Automatic;
@@ -409,6 +538,7 @@
409538
};
410539
8D69E23321DD476D00CFA49B /* Release */ = {
411540
isa = XCBuildConfiguration;
541+
baseConfigurationReference = 9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */;
412542
buildSettings = {
413543
CODE_SIGN_IDENTITY = "";
414544
CODE_SIGN_STYLE = Automatic;
@@ -432,6 +562,7 @@
432562
};
433563
8D69E23521DD476D00CFA49B /* Debug */ = {
434564
isa = XCBuildConfiguration;
565+
baseConfigurationReference = C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */;
435566
buildSettings = {
436567
CODE_SIGN_STYLE = Automatic;
437568
INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist;
@@ -457,6 +588,7 @@
457588
};
458589
8D69E23621DD476D00CFA49B /* Release */ = {
459590
isa = XCBuildConfiguration;
591+
baseConfigurationReference = 02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */;
460592
buildSettings = {
461593
CODE_SIGN_STYLE = Automatic;
462594
INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist;

‎AnonymousAuth/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ PODS:
1212
- FirebaseAuthInterop (1.0.0)
1313
- FirebaseCore (5.3.1):
1414
- GoogleUtilities/Logger (~> 5.2)
15-
- FirebaseUI/Auth (6.1.1):
16-
- Firebase/Auth (~> 5.0)
15+
- FirebaseUI/Auth (6.2.1):
16+
- Firebase/Auth (~> 5.4)
1717
- GoogleUtilities/UserDefaults
1818
- GoogleUtilities/Environment (5.4.0)
1919
- GoogleUtilities/Logger (5.4.0):
@@ -46,7 +46,7 @@ SPEC CHECKSUMS:
4646
FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6
4747
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
4848
FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3
49-
FirebaseUI: fc3584df29e96959d895677274681939fa30dbe5
49+
FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc
5050
GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560
5151
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
5252
OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab

0 commit comments

Comments
 (0)