Skip to content

Commit 2f6a07d

Browse files
gabrieldccgabrieldcc
committed
corrigindo conflitos
1 parent 38c876c commit 2f6a07d

File tree

1 file changed

+0
-124
lines changed

1 file changed

+0
-124
lines changed

‎solutions/devsprint-caio-santos-7/FinanceApp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
7467F92DB30FD18B4C6E43CF /* ActivityDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EF5038D81E1E53463FF1D9A /* ActivityDetailsView.swift */; };
2626
78B6FCF4F01EC79F86BA55E1 /* ConfirmationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9540C15A27511CC4BF88D56 /* ConfirmationViewController.swift */; };
2727
796F0ACB41DA74ED6C7C6723 /* ActivityCellViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DAA3EC9E94F0081A556A745 /* ActivityCellViewTests.swift */; };
28-
7C729C88D86712CDBD84E60D /* Pods_FinanceAppTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FCD1A804DB6B53778650C91B /* Pods_FinanceAppTests.framework */; };
2928
8B31A474E0A324524D0DF786 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AF7AAF2F806E598D9228936 /* TabBarController.swift */; };
3029
90C3B2330927FF873F089C09 /* String+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F07498195E801BD1EF0F7819 /* String+Extensions.swift */; };
3130
912306005FA36F07160D9772 /* ConfirmationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644426AB016110766DB58B1F /* ConfirmationView.swift */; };
@@ -39,7 +38,6 @@
3938
B96FA9468D32C5CDC8376BDD /* ViewCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D26BAC8C4955441648614D1 /* ViewCodable.swift */; };
4039
C2A79F91164C5E754D869621 /* TransferResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00829B3C3873C0CAB37D8511 /* TransferResult.swift */; };
4140
C36AAB6FCB4E4A831C64A062 /* ContactListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDCF8122A4E60D40C5D68B2E /* ContactListViewController.swift */; };
42-
E21FBCC8BC090A72EC560C06 /* Pods_FinanceApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA15C8422949B20FF7DC5A8 /* Pods_FinanceApp.framework */; };
4341
E265DA050E4C70738092243B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A31099C0C61DBA4B67FCDD2 /* AppDelegate.swift */; };
4442
EF5D360F2AABE1E6226F8A15 /* ContactListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644110235DFB8A836BE49DD5 /* ContactListTableViewCell.swift */; };
4543
FE2B8575660D3635F7FE2CE2 /* ActivityDetailsViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 723B71A3A3F22A8528EA1932 /* ActivityDetailsViewTests.swift */; };
@@ -49,7 +47,6 @@
4947
/* Begin PBXFileReference section */
5048
00829B3C3873C0CAB37D8511 /* TransferResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransferResult.swift; sourceTree = "<group>"; };
5149
00AE0D00E32B733D5FC92B7D /* TransfersViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransfersViewController.swift; sourceTree = "<group>"; };
52-
0B7369BA550A12E0D276C091 /* Pods-FinanceAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FinanceAppTests.debug.xcconfig"; path = "Target Support Files/Pods-FinanceAppTests/Pods-FinanceAppTests.debug.xcconfig"; sourceTree = "<group>"; };
5350
1D87EBB899BB9667557FC6AB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
5451
1DAED62F204FC2F878B40FBB /* Contact.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Contact.swift; sourceTree = "<group>"; };
5552
233E8A6DA351DEC50193DEA0 /* UserProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileView.swift; sourceTree = "<group>"; };
@@ -58,7 +55,6 @@
5855
2DF0BD35758D51AF0A3D2C82 /* ContactListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListView.swift; sourceTree = "<group>"; };
5956
3D26BAC8C4955441648614D1 /* ViewCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewCodable.swift; sourceTree = "<group>"; };
6057
3EF5038D81E1E53463FF1D9A /* ActivityDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityDetailsView.swift; sourceTree = "<group>"; };
61-
3EFEC7859D16ADA796D21681 /* Pods-FinanceApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FinanceApp.debug.xcconfig"; path = "Target Support Files/Pods-FinanceApp/Pods-FinanceApp.debug.xcconfig"; sourceTree = "<group>"; };
6258
580F2A230BF97711062AE698 /* ContactListViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListViewTests.swift; sourceTree = "<group>"; };
6359
5C423874884444505A6D8FCF /* ContactListTableViewCellTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListTableViewCellTests.swift; sourceTree = "<group>"; };
6460
5DAA3EC9E94F0081A556A745 /* ActivityCellViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityCellViewTests.swift; sourceTree = "<group>"; };
@@ -75,12 +71,10 @@
7571
93A15DB6A1B61D2CB7BB32D2 /* UserProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfile.swift; sourceTree = "<group>"; };
7672
941EC85054564C24E024E1AB /* DebugViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugViewController.swift; sourceTree = "<group>"; };
7773
A6E729A8715D5374BBCEE209 /* ActivityCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityCellView.swift; sourceTree = "<group>"; };
78-
AE56456BE8B5195C77C60576 /* Pods-FinanceAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FinanceAppTests.release.xcconfig"; path = "Target Support Files/Pods-FinanceAppTests/Pods-FinanceAppTests.release.xcconfig"; sourceTree = "<group>"; };
7974
B8B08B1D33180C551083142A /* HomeData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeData.swift; sourceTree = "<group>"; };
8075
C4E4966B0D6C2A80E27566C6 /* FinanceAppTests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = FinanceAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8176
C5594E94102EF89B9DF5614B /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
8277
CCF1E92CFD456C9C322B28F6 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
83-
D6E2E249F94769F5AFF96DD0 /* Pods-FinanceApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FinanceApp.release.xcconfig"; path = "Target Support Files/Pods-FinanceApp/Pods-FinanceApp.release.xcconfig"; sourceTree = "<group>"; };
8478
DB4E0C668733DA96C91E7BCB /* ActivityDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityDetailsViewController.swift; sourceTree = "<group>"; };
8579
DBDD4F9A9A9CDB22A655B952 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
8680
E2D5172EBC2EFF6EFF3AEB5C /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -89,29 +83,8 @@
8983
EDCF8122A4E60D40C5D68B2E /* ContactListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListViewController.swift; sourceTree = "<group>"; };
9084
F07498195E801BD1EF0F7819 /* String+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extensions.swift"; sourceTree = "<group>"; };
9185
F9540C15A27511CC4BF88D56 /* ConfirmationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmationViewController.swift; sourceTree = "<group>"; };
92-
FCD1A804DB6B53778650C91B /* Pods_FinanceAppTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FinanceAppTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
93-
FDA15C8422949B20FF7DC5A8 /* Pods_FinanceApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FinanceApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9486
/* End PBXFileReference section */
9587

96-
/* Begin PBXFrameworksBuildPhase section */
97-
94C5F577839113EBB6112C14 /* Frameworks */ = {
98-
isa = PBXFrameworksBuildPhase;
99-
buildActionMask = 2147483647;
100-
files = (
101-
7C729C88D86712CDBD84E60D /* Pods_FinanceAppTests.framework in Frameworks */,
102-
);
103-
runOnlyForDeploymentPostprocessing = 0;
104-
};
105-
C71C78A915AA862277FCAC71 /* Frameworks */ = {
106-
isa = PBXFrameworksBuildPhase;
107-
buildActionMask = 2147483647;
108-
files = (
109-
E21FBCC8BC090A72EC560C06 /* Pods_FinanceApp.framework in Frameworks */,
110-
);
111-
runOnlyForDeploymentPostprocessing = 0;
112-
};
113-
/* End PBXFrameworksBuildPhase section */
114-
11588
/* Begin PBXGroup section */
11689
004C8C378C0631E21B051D30 /* Resources */ = {
11790
isa = PBXGroup;
@@ -173,18 +146,6 @@
173146
path = Cells;
174147
sourceTree = "<group>";
175148
};
176-
273C4EAB088D58D10455094D /* Pods */ = {
177-
isa = PBXGroup;
178-
children = (
179-
3EFEC7859D16ADA796D21681 /* Pods-FinanceApp.debug.xcconfig */,
180-
D6E2E249F94769F5AFF96DD0 /* Pods-FinanceApp.release.xcconfig */,
181-
0B7369BA550A12E0D276C091 /* Pods-FinanceAppTests.debug.xcconfig */,
182-
AE56456BE8B5195C77C60576 /* Pods-FinanceAppTests.release.xcconfig */,
183-
);
184-
name = Pods;
185-
path = Pods;
186-
sourceTree = "<group>";
187-
};
188149
29F6608C8E7C63005D680666 /* Products */ = {
189150
isa = PBXGroup;
190151
children = (
@@ -208,8 +169,6 @@
208169
8E3815F9C6D9EA0FCAE51155 /* FinanceApp */,
209170
67E437D62460C7B63BCBBEFE /* FinanceAppTests */,
210171
29F6608C8E7C63005D680666 /* Products */,
211-
273C4EAB088D58D10455094D /* Pods */,
212-
76144ACE6741D8ED31FC116F /* Frameworks */,
213172
);
214173
sourceTree = "<group>";
215174
};
@@ -248,15 +207,6 @@
248207
path = FinanceAppTests;
249208
sourceTree = "<group>";
250209
};
251-
76144ACE6741D8ED31FC116F /* Frameworks */ = {
252-
isa = PBXGroup;
253-
children = (
254-
FDA15C8422949B20FF7DC5A8 /* Pods_FinanceApp.framework */,
255-
FCD1A804DB6B53778650C91B /* Pods_FinanceAppTests.framework */,
256-
);
257-
name = Frameworks;
258-
sourceTree = "<group>";
259-
};
260210
8201B57AAD100558A5D8A80B /* Components */ = {
261211
isa = PBXGroup;
262212
children = (
@@ -371,10 +321,7 @@
371321
isa = PBXNativeTarget;
372322
buildConfigurationList = 790EE3660AE054DE62EEC8E2 /* Build configuration list for PBXNativeTarget "FinanceAppTests" */;
373323
buildPhases = (
374-
9452B7F3774AC50D624CF23E /* [CP] Check Pods Manifest.lock */,
375324
68DFE4D057F6FDFD99C0334D /* Sources */,
376-
94C5F577839113EBB6112C14 /* Frameworks */,
377-
30626D5E7CDD06DB8FAEF3CB /* [CP] Embed Pods Frameworks */,
378325
);
379326
buildRules = (
380327
);
@@ -389,10 +336,8 @@
389336
isa = PBXNativeTarget;
390337
buildConfigurationList = 10880C3807283129FCCA0926 /* Build configuration list for PBXNativeTarget "FinanceApp" */;
391338
buildPhases = (
392-
EE08DCFFC25F03208D8EBE91 /* [CP] Check Pods Manifest.lock */,
393339
E2D36BF245C9A834AB77A440 /* Sources */,
394340
79C092AECD11CAA880AF32D3 /* Resources */,
395-
C71C78A915AA862277FCAC71 /* Frameworks */,
396341
);
397342
buildRules = (
398343
);
@@ -422,7 +367,6 @@
422367
en,
423368
);
424369
mainGroup = 41664911853B1A777938E8B9;
425-
productRefGroup = 29F6608C8E7C63005D680666 /* Products */;
426370
projectDirPath = "";
427371
projectRoot = "";
428372
targets = (
@@ -444,70 +388,6 @@
444388
};
445389
/* End PBXResourcesBuildPhase section */
446390

447-
/* Begin PBXShellScriptBuildPhase section */
448-
30626D5E7CDD06DB8FAEF3CB /* [CP] Embed Pods Frameworks */ = {
449-
isa = PBXShellScriptBuildPhase;
450-
buildActionMask = 2147483647;
451-
files = (
452-
);
453-
inputFileListPaths = (
454-
"${PODS_ROOT}/Target Support Files/Pods-FinanceAppTests/Pods-FinanceAppTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
455-
);
456-
name = "[CP] Embed Pods Frameworks";
457-
outputFileListPaths = (
458-
"${PODS_ROOT}/Target Support Files/Pods-FinanceAppTests/Pods-FinanceAppTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
459-
);
460-
runOnlyForDeploymentPostprocessing = 0;
461-
shellPath = /bin/sh;
462-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FinanceAppTests/Pods-FinanceAppTests-frameworks.sh\"\n";
463-
showEnvVarsInLog = 0;
464-
};
465-
9452B7F3774AC50D624CF23E /* [CP] Check Pods Manifest.lock */ = {
466-
isa = PBXShellScriptBuildPhase;
467-
buildActionMask = 2147483647;
468-
files = (
469-
);
470-
inputFileListPaths = (
471-
);
472-
inputPaths = (
473-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
474-
"${PODS_ROOT}/Manifest.lock",
475-
);
476-
name = "[CP] Check Pods Manifest.lock";
477-
outputFileListPaths = (
478-
);
479-
outputPaths = (
480-
"$(DERIVED_FILE_DIR)/Pods-FinanceAppTests-checkManifestLockResult.txt",
481-
);
482-
runOnlyForDeploymentPostprocessing = 0;
483-
shellPath = /bin/sh;
484-
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";
485-
showEnvVarsInLog = 0;
486-
};
487-
EE08DCFFC25F03208D8EBE91 /* [CP] Check Pods Manifest.lock */ = {
488-
isa = PBXShellScriptBuildPhase;
489-
buildActionMask = 2147483647;
490-
files = (
491-
);
492-
inputFileListPaths = (
493-
);
494-
inputPaths = (
495-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
496-
"${PODS_ROOT}/Manifest.lock",
497-
);
498-
name = "[CP] Check Pods Manifest.lock";
499-
outputFileListPaths = (
500-
);
501-
outputPaths = (
502-
"$(DERIVED_FILE_DIR)/Pods-FinanceApp-checkManifestLockResult.txt",
503-
);
504-
runOnlyForDeploymentPostprocessing = 0;
505-
shellPath = /bin/sh;
506-
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";
507-
showEnvVarsInLog = 0;
508-
};
509-
/* End PBXShellScriptBuildPhase section */
510-
511391
/* Begin PBXSourcesBuildPhase section */
512392
68DFE4D057F6FDFD99C0334D /* Sources */ = {
513393
isa = PBXSourcesBuildPhase;
@@ -572,7 +452,6 @@
572452
/* Begin XCBuildConfiguration section */
573453
29CD84FC440408C334262976 /* Debug */ = {
574454
isa = XCBuildConfiguration;
575-
baseConfigurationReference = 0B7369BA550A12E0D276C091 /* Pods-FinanceAppTests.debug.xcconfig */;
576455
buildSettings = {
577456
BUNDLE_LOADER = "$(TEST_HOST)";
578457
INFOPLIST_FILE = FinanceAppTests/Info.plist;
@@ -653,7 +532,6 @@
653532
};
654533
640D4A1E8DD181082E61A4F2 /* Debug */ = {
655534
isa = XCBuildConfiguration;
656-
baseConfigurationReference = 3EFEC7859D16ADA796D21681 /* Pods-FinanceApp.debug.xcconfig */;
657535
buildSettings = {
658536
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
659537
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -670,7 +548,6 @@
670548
};
671549
6F814397452B25B3C7842525 /* Release */ = {
672550
isa = XCBuildConfiguration;
673-
baseConfigurationReference = D6E2E249F94769F5AFF96DD0 /* Pods-FinanceApp.release.xcconfig */;
674551
buildSettings = {
675552
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
676553
CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -687,7 +564,6 @@
687564
};
688565
C79AA9F410A9CDFBBD6D509A /* Release */ = {
689566
isa = XCBuildConfiguration;
690-
baseConfigurationReference = AE56456BE8B5195C77C60576 /* Pods-FinanceAppTests.release.xcconfig */;
691567
buildSettings = {
692568
BUNDLE_LOADER = "$(TEST_HOST)";
693569
INFOPLIST_FILE = FinanceAppTests/Info.plist;

0 commit comments

Comments
 (0)