From 6f0e01488f5fa46f1624e1bd2dcebda28b98f7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sarstr=C3=B6m?= Date: Thu, 9 Sep 2021 09:12:23 +0200 Subject: [PATCH] Fixes podfile issues, and project file merge --- packages/app/ios/Podfile.lock | 10 +- .../app/ios/app.xcodeproj/project.pbxproj | 538 +++++------------- 2 files changed, 162 insertions(+), 386 deletions(-) diff --git a/packages/app/ios/Podfile.lock b/packages/app/ios/Podfile.lock index d1317877..0fa0c2b7 100644 --- a/packages/app/ios/Podfile.lock +++ b/packages/app/ios/Podfile.lock @@ -276,7 +276,7 @@ PODS: - React-Core - react-native-restart (0.0.22): - React-Core - - react-native-safe-area-context (3.2.0): + - react-native-safe-area-context (3.3.2): - React-Core - react-native-simple-toast (1.1.3): - React-Core @@ -357,7 +357,7 @@ PODS: - React-Core - RNGestureHandler (1.10.3): - React-Core - - RNLocalize (2.0.3): + - RNLocalize (2.1.4): - React-Core - RNReanimated (2.2.0): - DoubleConversion @@ -580,7 +580,7 @@ SPEC CHECKSUMS: CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53 - FBReactNativeSpec: 4b7ea7298d621948b6adf28572da85fc3b97b348 + FBReactNativeSpec: bccf734a67a9e2c2f8e09e48b0b8e3571fceb9ea Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c @@ -607,7 +607,7 @@ SPEC CHECKSUMS: react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c react-native-cookies: ce50e42ace7cf0dd47769260ca5bbe8eee607e4e react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979 - react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79 + react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057 react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f react-native-webview: 4c85a3e5de574ee8c2c0985b4bebbdd240f49304 React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675 @@ -627,7 +627,7 @@ SPEC CHECKSUMS: RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 RNDateTimePicker: d943800c936fb01c352fcfb70439550d2cb57092 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 - RNLocalize: 99e59cad311ca1b6872b1764514009416ccba03d + RNLocalize: 7f1e5792b65a839af55a9552d05b3558b66d017e RNReanimated: 9c13c86454bfd54dab7505c1a054470bfecd2563 RNScreens: eb0dfb2d6b21d2d7f980ad46b14eb306d2f1062e RNSVG: ce9d996113475209013317e48b05c21ee988d42e diff --git a/packages/app/ios/app.xcodeproj/project.pbxproj b/packages/app/ios/app.xcodeproj/project.pbxproj index 43e23e8c..f2f0110f 100644 --- a/packages/app/ios/app.xcodeproj/project.pbxproj +++ b/packages/app/ios/app.xcodeproj/project.pbxproj @@ -9,47 +9,35 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* appTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* appTests.m */; }; 04B5A89762F9430A902416B4 /* Poppins-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3CBFE8DBE8994C1FAF939519 /* Poppins-MediumItalic.ttf */; }; + 06EF4026A2A2C026AA828DE7 /* libPods-app-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CBA9B88D913D175DE2F9AF2C /* libPods-app-tvOS.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 143FF66AE1AD70EFD06AC8AF /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 649626B23769045AA20DEA4B /* libPods-app.a */; }; 230E5925A9044F679B2F7C39 /* Poppins-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7AF5677EA52D44EE97668E7A /* Poppins-Medium.ttf */; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2DC4DBF14540481ABF14857A /* Poppins-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9A9C27037F0F4AF2A4CBAE78 /* Poppins-ExtraBold.ttf */; }; 2DCD954D1E0B4F2C00145EB5 /* appTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* appTests.m */; }; + 3839D0C903CA0368292FFBED /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ABAF78D023E6034B17BFCA1D /* libPods-app-appTests.a */; }; 417D579C3DC24A9684D24EDD /* Poppins-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 00FDE4C2522044DAAD866D5F /* Poppins-BlackItalic.ttf */; }; 41DE97CF96674977BC052462 /* Poppins-SemiBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A9CB7679337840D3BD256A13 /* Poppins-SemiBoldItalic.ttf */; }; -<<<<<<< HEAD - 467D601E14C1D20353B0E359 /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28F4413964093C3588586E4B /* libPods-app-appTests.a */; }; -======= - 47BDB18EB778190FE74D4711 /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD636EC71EB046C8CA3092FC /* libPods-app-appTests.a */; }; - 4B4CB82443211891C9F102C7 /* libPods-app-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD971982E1DA8A02706ED0DB /* libPods-app-tvOSTests.a */; }; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee 4E01D1C8DD5749C8953D3BE5 /* Poppins-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 661AE05493ED4FE780C32EF6 /* Poppins-Bold.ttf */; }; 4F931CB3182F40F580F357FF /* Poppins-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E251C7BB03F74441B4357419 /* Poppins-ThinItalic.ttf */; }; 50AAEBD19BD24B129801C393 /* Poppins-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 977D264ECA05485EA89A2F13 /* Poppins-Italic.ttf */; }; 5257E7B8420740A2862BEEB0 /* Poppins-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8E2BDC4163F1467E94E5D34C /* Poppins-BoldItalic.ttf */; }; 6D069850985349ABB76BDD0A /* Poppins-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B1A304CF782943E19F93DFD6 /* Poppins-Black.ttf */; }; 71436C48CDF348BE904103E9 /* Poppins-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 231B760691854EBCA7ECD80E /* Poppins-Light.ttf */; }; - 7B3AE70EB6D77BA7B6328B73 /* libPods-app-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD2C4F5EEF833715B357730 /* libPods-app-tvOSTests.a */; }; 7B94D8768C6340958F2EEFFD /* Poppins-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C9AC377D6B7744ECBBEA0A8A /* Poppins-ExtraLight.ttf */; }; + 8030EDC59512005C9DB0CAE0 /* libPods-app-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97D917C10337C9F73D25C201 /* libPods-app-tvOSTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; 836E1F3164D8497F8C51847A /* Poppins-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7CEBAD12E8E5471AA962262A /* Poppins-LightItalic.ttf */; }; + 86CD956ED335949548E33715 /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D78C7FC73D07A3077420A276 /* libPods-app.a */; }; 8F8E6DB2A0AB4DF3A5ED51E7 /* Poppins-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 920F53F06E0B433DB798AC45 /* Poppins-SemiBold.ttf */; }; - 9BB2301820933CB162183656 /* libPods-app-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9899046DFCE4CA5E2101CBE0 /* libPods-app-tvOS.a */; }; 9FA2A398A0264369AD50123F /* Poppins-ExtraBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9F1539AF1544412D9662D264 /* Poppins-ExtraBoldItalic.ttf */; }; 9FC2C87C76F74B609BA3709E /* Poppins-ExtraLightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9420B3EA5C884AFFADCAFB4C /* Poppins-ExtraLightItalic.ttf */; }; -<<<<<<< HEAD AC5E863985C04D72B5806B58 /* Poppins-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 02B78F6C72354B2D8171239D /* Poppins-Thin.ttf */; }; BB34E03413EB4CDFA59766B1 /* Poppins-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EB6EB5293E4C48098CBD53C2 /* Poppins-Regular.ttf */; }; - F519E219289BEDEDEA9E3B95 /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CFC1EE9CE77CFD3DE61BBFE /* libPods-app.a */; }; -======= - A4BF559C3C24B81BCBBC0C43 /* libPods-app-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 107C1F5266AD5BE6840522FD /* libPods-app-tvOS.a */; }; - AC5E863985C04D72B5806B58 /* Poppins-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 02B78F6C72354B2D8171239D /* Poppins-Thin.ttf */; }; - BB34E03413EB4CDFA59766B1 /* Poppins-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EB6EB5293E4C48098CBD53C2 /* Poppins-Regular.ttf */; }; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -74,86 +62,47 @@ 00E356EE1AD99517003FC87E /* appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* appTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = appTests.m; sourceTree = ""; }; -<<<<<<< HEAD - 00FDE4C2522044DAAD866D5F /* Poppins-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-BlackItalic.ttf"; path = "../assets/fonts/Poppins-BlackItalic.ttf"; sourceTree = ""; }; - 02B78F6C72354B2D8171239D /* Poppins-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Thin.ttf"; path = "../assets/fonts/Poppins-Thin.ttf"; sourceTree = ""; }; - 0668F5F97ABB0B90C666286A /* Pods-app-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-app-tvOS/Pods-app-tvOS.debug.xcconfig"; sourceTree = ""; }; -======= 00FDE4C2522044DAAD866D5F /* Poppins-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-BlackItalic.ttf"; path = "../assets/fonts/Poppins-BlackItalic.ttf"; sourceTree = ""; }; 02B78F6C72354B2D8171239D /* Poppins-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Thin.ttf"; path = "../assets/fonts/Poppins-Thin.ttf"; sourceTree = ""; }; - 107C1F5266AD5BE6840522FD /* libPods-app-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee 13B07F961A680F5B00A75B9A /* app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = app/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = app/AppDelegate.m; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = app/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = app/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = ""; }; -<<<<<<< HEAD - 231B760691854EBCA7ECD80E /* Poppins-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Light.ttf"; path = "../assets/fonts/Poppins-Light.ttf"; sourceTree = ""; }; - 28A7638D2A4F8DB18E405DF8 /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; - 28F4413964093C3588586E4B /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D02E47B1E0B4A5D006451C7 /* app-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D02E4901E0B4A5D006451C7 /* app-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "app-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 39860E8D652FC0F60C40DA4E /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; - 3CBFE8DBE8994C1FAF939519 /* Poppins-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-MediumItalic.ttf"; path = "../assets/fonts/Poppins-MediumItalic.ttf"; sourceTree = ""; }; - 4CFC1EE9CE77CFD3DE61BBFE /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 661AE05493ED4FE780C32EF6 /* Poppins-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Bold.ttf"; path = "../assets/fonts/Poppins-Bold.ttf"; sourceTree = ""; }; - 6A7EDD883BA30EB3E77BA661 /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; - 6CD2C4F5EEF833715B357730 /* libPods-app-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 7AF5677EA52D44EE97668E7A /* Poppins-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Medium.ttf"; path = "../assets/fonts/Poppins-Medium.ttf"; sourceTree = ""; }; - 7CEBAD12E8E5471AA962262A /* Poppins-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-LightItalic.ttf"; path = "../assets/fonts/Poppins-LightItalic.ttf"; sourceTree = ""; }; - 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = app/LaunchScreen.storyboard; sourceTree = ""; }; - 8E2BDC4163F1467E94E5D34C /* Poppins-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-BoldItalic.ttf"; path = "../assets/fonts/Poppins-BoldItalic.ttf"; sourceTree = ""; }; - 920F53F06E0B433DB798AC45 /* Poppins-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-SemiBold.ttf"; path = "../assets/fonts/Poppins-SemiBold.ttf"; sourceTree = ""; }; - 9420B3EA5C884AFFADCAFB4C /* Poppins-ExtraLightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraLightItalic.ttf"; path = "../assets/fonts/Poppins-ExtraLightItalic.ttf"; sourceTree = ""; }; - 977D264ECA05485EA89A2F13 /* Poppins-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Italic.ttf"; path = "../assets/fonts/Poppins-Italic.ttf"; sourceTree = ""; }; - 9899046DFCE4CA5E2101CBE0 /* libPods-app-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 9A9C27037F0F4AF2A4CBAE78 /* Poppins-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraBold.ttf"; path = "../assets/fonts/Poppins-ExtraBold.ttf"; sourceTree = ""; }; - 9F1539AF1544412D9662D264 /* Poppins-ExtraBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraBoldItalic.ttf"; path = "../assets/fonts/Poppins-ExtraBoldItalic.ttf"; sourceTree = ""; }; - A9CB7679337840D3BD256A13 /* Poppins-SemiBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-SemiBoldItalic.ttf"; path = "../assets/fonts/Poppins-SemiBoldItalic.ttf"; sourceTree = ""; }; - B1A304CF782943E19F93DFD6 /* Poppins-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Black.ttf"; path = "../assets/fonts/Poppins-Black.ttf"; sourceTree = ""; }; - B6E0D620E14A79C76BEEE7B0 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; - C9AC377D6B7744ECBBEA0A8A /* Poppins-ExtraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraLight.ttf"; path = "../assets/fonts/Poppins-ExtraLight.ttf"; sourceTree = ""; }; - CEA926A3EC369BA705616454 /* Pods-app-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-app-tvOSTests/Pods-app-tvOSTests.release.xcconfig"; sourceTree = ""; }; - CF8CACB29D1B5EA56F49A758 /* Pods-app-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-app-tvOSTests/Pods-app-tvOSTests.debug.xcconfig"; sourceTree = ""; }; - DB5D08EF48EFB3984BD34C97 /* Pods-app-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOS.release.xcconfig"; path = "Target Support Files/Pods-app-tvOS/Pods-app-tvOS.release.xcconfig"; sourceTree = ""; }; - E251C7BB03F74441B4357419 /* Poppins-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ThinItalic.ttf"; path = "../assets/fonts/Poppins-ThinItalic.ttf"; sourceTree = ""; }; - EB6EB5293E4C48098CBD53C2 /* Poppins-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Regular.ttf"; path = "../assets/fonts/Poppins-Regular.ttf"; sourceTree = ""; }; -======= + 13E39C0A4346CA35EFAAB838 /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; 231B760691854EBCA7ECD80E /* Poppins-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Light.ttf"; path = "../assets/fonts/Poppins-Light.ttf"; sourceTree = ""; }; - 280FE376BA9F68A835942339 /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; + 235F48B6B850D19CA9BF2649 /* Pods-app-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-app-tvOSTests/Pods-app-tvOSTests.debug.xcconfig"; sourceTree = ""; }; 2D02E47B1E0B4A5D006451C7 /* app-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* app-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "app-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 3CBFE8DBE8994C1FAF939519 /* Poppins-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-MediumItalic.ttf"; path = "../assets/fonts/Poppins-MediumItalic.ttf"; sourceTree = ""; }; - 5D7CFBD33492245E6092DA58 /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; - 649626B23769045AA20DEA4B /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 54670C63EF0E8A87F410DAB8 /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; 661AE05493ED4FE780C32EF6 /* Poppins-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Bold.ttf"; path = "../assets/fonts/Poppins-Bold.ttf"; sourceTree = ""; }; - 78354E27627CAB6650C6B533 /* Pods-app-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-app-tvOSTests/Pods-app-tvOSTests.debug.xcconfig"; sourceTree = ""; }; + 6983ACF71C2DB9CAD486BB74 /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; 7AF5677EA52D44EE97668E7A /* Poppins-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Medium.ttf"; path = "../assets/fonts/Poppins-Medium.ttf"; sourceTree = ""; }; - 7C857A37CA77892FBE4CBCB4 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; 7CEBAD12E8E5471AA962262A /* Poppins-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-LightItalic.ttf"; path = "../assets/fonts/Poppins-LightItalic.ttf"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = app/LaunchScreen.storyboard; sourceTree = ""; }; 8E2BDC4163F1467E94E5D34C /* Poppins-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-BoldItalic.ttf"; path = "../assets/fonts/Poppins-BoldItalic.ttf"; sourceTree = ""; }; 920F53F06E0B433DB798AC45 /* Poppins-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-SemiBold.ttf"; path = "../assets/fonts/Poppins-SemiBold.ttf"; sourceTree = ""; }; 9420B3EA5C884AFFADCAFB4C /* Poppins-ExtraLightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraLightItalic.ttf"; path = "../assets/fonts/Poppins-ExtraLightItalic.ttf"; sourceTree = ""; }; 977D264ECA05485EA89A2F13 /* Poppins-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Italic.ttf"; path = "../assets/fonts/Poppins-Italic.ttf"; sourceTree = ""; }; + 97D917C10337C9F73D25C201 /* libPods-app-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9A1C3A8DF053872D94D965DB /* Pods-app-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-app-tvOSTests/Pods-app-tvOSTests.release.xcconfig"; sourceTree = ""; }; 9A9C27037F0F4AF2A4CBAE78 /* Poppins-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraBold.ttf"; path = "../assets/fonts/Poppins-ExtraBold.ttf"; sourceTree = ""; }; + 9DBBE2746B61F26784F9B797 /* Pods-app-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOS.release.xcconfig"; path = "Target Support Files/Pods-app-tvOS/Pods-app-tvOS.release.xcconfig"; sourceTree = ""; }; 9F1539AF1544412D9662D264 /* Poppins-ExtraBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraBoldItalic.ttf"; path = "../assets/fonts/Poppins-ExtraBoldItalic.ttf"; sourceTree = ""; }; A9CB7679337840D3BD256A13 /* Poppins-SemiBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-SemiBoldItalic.ttf"; path = "../assets/fonts/Poppins-SemiBoldItalic.ttf"; sourceTree = ""; }; - ABBB8754EE361CB0204F582C /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; + ABAF78D023E6034B17BFCA1D /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B1A304CF782943E19F93DFD6 /* Poppins-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Black.ttf"; path = "../assets/fonts/Poppins-Black.ttf"; sourceTree = ""; }; - B7D610CEAB7656E9EF5F11F8 /* Pods-app-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-app-tvOSTests/Pods-app-tvOSTests.release.xcconfig"; sourceTree = ""; }; - BFAE0434A1EC7279E958CD5B /* Pods-app-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-app-tvOS/Pods-app-tvOS.debug.xcconfig"; sourceTree = ""; }; + C32B8001F84C0C16DCE0924D /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; + C6C4BFFAB9712335DC783C83 /* Pods-app-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-app-tvOS/Pods-app-tvOS.debug.xcconfig"; sourceTree = ""; }; C9AC377D6B7744ECBBEA0A8A /* Poppins-ExtraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ExtraLight.ttf"; path = "../assets/fonts/Poppins-ExtraLight.ttf"; sourceTree = ""; }; - CF4C3955B9AD96EFCFD90FF4 /* Pods-app-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-tvOS.release.xcconfig"; path = "Target Support Files/Pods-app-tvOS/Pods-app-tvOS.release.xcconfig"; sourceTree = ""; }; - DD971982E1DA8A02706ED0DB /* libPods-app-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + CBA9B88D913D175DE2F9AF2C /* libPods-app-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + D78C7FC73D07A3077420A276 /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E251C7BB03F74441B4357419 /* Poppins-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-ThinItalic.ttf"; path = "../assets/fonts/Poppins-ThinItalic.ttf"; sourceTree = ""; }; EB6EB5293E4C48098CBD53C2 /* Poppins-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Regular.ttf"; path = "../assets/fonts/Poppins-Regular.ttf"; sourceTree = ""; }; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; - FD636EC71EB046C8CA3092FC /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -161,11 +110,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( -<<<<<<< HEAD - 467D601E14C1D20353B0E359 /* libPods-app-appTests.a in Frameworks */, -======= - 47BDB18EB778190FE74D4711 /* libPods-app-appTests.a in Frameworks */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 3839D0C903CA0368292FFBED /* libPods-app-appTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -173,11 +118,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( -<<<<<<< HEAD - F519E219289BEDEDEA9E3B95 /* libPods-app.a in Frameworks */, -======= - 143FF66AE1AD70EFD06AC8AF /* libPods-app.a in Frameworks */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 86CD956ED335949548E33715 /* libPods-app.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -185,11 +126,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( -<<<<<<< HEAD - 9BB2301820933CB162183656 /* libPods-app-tvOS.a in Frameworks */, -======= - A4BF559C3C24B81BCBBC0C43 /* libPods-app-tvOS.a in Frameworks */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 06EF4026A2A2C026AA828DE7 /* libPods-app-tvOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -197,11 +134,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( -<<<<<<< HEAD - 7B3AE70EB6D77BA7B6328B73 /* libPods-app-tvOSTests.a in Frameworks */, -======= - 4B4CB82443211891C9F102C7 /* libPods-app-tvOSTests.a in Frameworks */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 8030EDC59512005C9DB0CAE0 /* libPods-app-tvOSTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -244,17 +177,10 @@ children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, ED2971642150620600B7C4FE /* JavaScriptCore.framework */, -<<<<<<< HEAD - 4CFC1EE9CE77CFD3DE61BBFE /* libPods-app.a */, - 28F4413964093C3588586E4B /* libPods-app-appTests.a */, - 9899046DFCE4CA5E2101CBE0 /* libPods-app-tvOS.a */, - 6CD2C4F5EEF833715B357730 /* libPods-app-tvOSTests.a */, -======= - 649626B23769045AA20DEA4B /* libPods-app.a */, - FD636EC71EB046C8CA3092FC /* libPods-app-appTests.a */, - 107C1F5266AD5BE6840522FD /* libPods-app-tvOS.a */, - DD971982E1DA8A02706ED0DB /* libPods-app-tvOSTests.a */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + D78C7FC73D07A3077420A276 /* libPods-app.a */, + ABAF78D023E6034B17BFCA1D /* libPods-app-appTests.a */, + CBA9B88D913D175DE2F9AF2C /* libPods-app-tvOS.a */, + 97D917C10337C9F73D25C201 /* libPods-app-tvOSTests.a */, ); name = Frameworks; sourceTree = ""; @@ -262,25 +188,14 @@ 678C13018B6095451BF5FE91 /* Pods */ = { isa = PBXGroup; children = ( -<<<<<<< HEAD - 39860E8D652FC0F60C40DA4E /* Pods-app.debug.xcconfig */, - 28A7638D2A4F8DB18E405DF8 /* Pods-app.release.xcconfig */, - B6E0D620E14A79C76BEEE7B0 /* Pods-app-appTests.debug.xcconfig */, - 6A7EDD883BA30EB3E77BA661 /* Pods-app-appTests.release.xcconfig */, - 0668F5F97ABB0B90C666286A /* Pods-app-tvOS.debug.xcconfig */, - DB5D08EF48EFB3984BD34C97 /* Pods-app-tvOS.release.xcconfig */, - CF8CACB29D1B5EA56F49A758 /* Pods-app-tvOSTests.debug.xcconfig */, - CEA926A3EC369BA705616454 /* Pods-app-tvOSTests.release.xcconfig */, -======= - ABBB8754EE361CB0204F582C /* Pods-app.debug.xcconfig */, - 280FE376BA9F68A835942339 /* Pods-app.release.xcconfig */, - 7C857A37CA77892FBE4CBCB4 /* Pods-app-appTests.debug.xcconfig */, - 5D7CFBD33492245E6092DA58 /* Pods-app-appTests.release.xcconfig */, - BFAE0434A1EC7279E958CD5B /* Pods-app-tvOS.debug.xcconfig */, - CF4C3955B9AD96EFCFD90FF4 /* Pods-app-tvOS.release.xcconfig */, - 78354E27627CAB6650C6B533 /* Pods-app-tvOSTests.debug.xcconfig */, - B7D610CEAB7656E9EF5F11F8 /* Pods-app-tvOSTests.release.xcconfig */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 54670C63EF0E8A87F410DAB8 /* Pods-app.debug.xcconfig */, + 13E39C0A4346CA35EFAAB838 /* Pods-app.release.xcconfig */, + C32B8001F84C0C16DCE0924D /* Pods-app-appTests.debug.xcconfig */, + 6983ACF71C2DB9CAD486BB74 /* Pods-app-appTests.release.xcconfig */, + C6C4BFFAB9712335DC783C83 /* Pods-app-tvOS.debug.xcconfig */, + 9DBBE2746B61F26784F9B797 /* Pods-app-tvOS.release.xcconfig */, + 235F48B6B850D19CA9BF2649 /* Pods-app-tvOSTests.debug.xcconfig */, + 9A1C3A8DF053872D94D965DB /* Pods-app-tvOSTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -351,21 +266,12 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "appTests" */; buildPhases = ( -<<<<<<< HEAD - 15FC8B1F8DFC7AB53C0EF515 /* [CP] Check Pods Manifest.lock */, + BEE936CAAB2506EC97BA4987 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 4667C4320F34031720797F3C /* [CP] Embed Pods Frameworks */, - 1303A35A8DA2C129B4A23206 /* [CP] Copy Pods Resources */, -======= - 9BEAF09BF368870D3BB29E38 /* [CP] Check Pods Manifest.lock */, - 00E356EA1AD99517003FC87E /* Sources */, - 00E356EB1AD99517003FC87E /* Frameworks */, - 00E356EC1AD99517003FC87E /* Resources */, - 7AEB38910E2F1F4FA88EE94D /* [CP] Embed Pods Frameworks */, - 5DD7CD1D56DCD6B3E5B1A9CE /* [CP] Copy Pods Resources */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + A07D25E5AD64CE84E120269D /* [CP] Embed Pods Frameworks */, + 8F85084BF96E0BD6300248ED /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -381,23 +287,14 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "app" */; buildPhases = ( -<<<<<<< HEAD - 9D29BE040AF7360F45D8F001 /* [CP] Check Pods Manifest.lock */, -======= - 56D66DD8C93796E7A3323F8C /* [CP] Check Pods Manifest.lock */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + A5427067DE8DE08CFF8C3574 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, -<<<<<<< HEAD - 85710E966BCE235165F09B27 /* [CP] Embed Pods Frameworks */, - E66B18CD904BC57656D86881 /* [CP] Copy Pods Resources */, -======= - EA6BA965CC0D35699B0303AC /* [CP] Embed Pods Frameworks */, - 1AF25533702B867240211810 /* [CP] Copy Pods Resources */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + D8D17ECE21FE717B3DF8D712 /* [CP] Embed Pods Frameworks */, + F168438BE2735A792825B1F5 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -412,11 +309,7 @@ isa = PBXNativeTarget; buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "app-tvOS" */; buildPhases = ( -<<<<<<< HEAD - 91C2B75DF4E11DA4A4EAF855 /* [CP] Check Pods Manifest.lock */, -======= - 3FBB5CCBE77389243E830A24 /* [CP] Check Pods Manifest.lock */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + F288032FE542996BFC1DFB8F /* [CP] Check Pods Manifest.lock */, FD10A7F122414F3F0027D42C /* Start Packager */, 2D02E4771E0B4A5D006451C7 /* Sources */, 2D02E4781E0B4A5D006451C7 /* Frameworks */, @@ -436,11 +329,7 @@ isa = PBXNativeTarget; buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "app-tvOSTests" */; buildPhases = ( -<<<<<<< HEAD - B2F9836D8AFDD83F0C8689F6 /* [CP] Check Pods Manifest.lock */, -======= - C64D066F4E7C024DDB16BE45 /* [CP] Check Pods Manifest.lock */, ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 9261A89E13D33A4560884388 /* [CP] Check Pods Manifest.lock */, 2D02E48C1E0B4A5D006451C7 /* Sources */, 2D02E48D1E0B4A5D006451C7 /* Frameworks */, 2D02E48E1E0B4A5D006451C7 /* Resources */, @@ -575,50 +464,6 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; -<<<<<<< HEAD - 1303A35A8DA2C129B4A23206 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 15FC8B1F8DFC7AB53C0EF515 /* [CP] Check Pods Manifest.lock */ = { -======= - 1AF25533702B867240211810 /* [CP] Copy Pods Resources */ = { ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( -<<<<<<< HEAD - "$(DERIVED_FILE_DIR)/Pods-app-appTests-checkManifestLockResult.txt", -======= - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -633,86 +478,7 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; -<<<<<<< HEAD - 4667C4320F34031720797F3C /* [CP] Embed Pods Frameworks */ = { -======= - 3FBB5CCBE77389243E830A24 /* [CP] Check Pods Manifest.lock */ = { ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( -<<<<<<< HEAD - "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh", - "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 85710E966BCE235165F09B27 /* [CP] Embed Pods Frameworks */ = { -======= - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-app-tvOS-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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"; - showEnvVarsInLog = 0; - }; - 56D66DD8C93796E7A3323F8C /* [CP] Check Pods Manifest.lock */ = { ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( -<<<<<<< HEAD - "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks.sh", - "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", -======= - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-app-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; -<<<<<<< HEAD - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 91C2B75DF4E11DA4A4EAF855 /* [CP] Check Pods Manifest.lock */ = { -======= - 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"; - showEnvVarsInLog = 0; - }; - 5DD7CD1D56DCD6B3E5B1A9CE /* [CP] Copy Pods Resources */ = { ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 8F85084BF96E0BD6300248ED /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -723,72 +489,14 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( -<<<<<<< HEAD - "$(DERIVED_FILE_DIR)/Pods-app-tvOS-checkManifestLockResult.txt", -======= "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; -<<<<<<< HEAD - 9D29BE040AF7360F45D8F001 /* [CP] Check Pods Manifest.lock */ = { -======= - 7AEB38910E2F1F4FA88EE94D /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh", - "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 9BEAF09BF368870D3BB29E38 /* [CP] Check Pods Manifest.lock */ = { ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( -<<<<<<< HEAD - "$(DERIVED_FILE_DIR)/Pods-app-checkManifestLockResult.txt", -======= - "$(DERIVED_FILE_DIR)/Pods-app-appTests-checkManifestLockResult.txt", ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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"; - showEnvVarsInLog = 0; - }; -<<<<<<< HEAD - B2F9836D8AFDD83F0C8689F6 /* [CP] Check Pods Manifest.lock */ = { -======= - C64D066F4E7C024DDB16BE45 /* [CP] Check Pods Manifest.lock */ = { ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + 9261A89E13D33A4560884388 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -810,11 +518,71 @@ 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"; showEnvVarsInLog = 0; }; -<<<<<<< HEAD - E66B18CD904BC57656D86881 /* [CP] Copy Pods Resources */ = { -======= - EA6BA965CC0D35699B0303AC /* [CP] Embed Pods Frameworks */ = { ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + A07D25E5AD64CE84E120269D /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh", + "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + A5427067DE8DE08CFF8C3574 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-app-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + 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"; + showEnvVarsInLog = 0; + }; + BEE936CAAB2506EC97BA4987 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-app-appTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + 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"; + showEnvVarsInLog = 0; + }; + D8D17ECE21FE717B3DF8D712 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -834,6 +602,46 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; + F168438BE2735A792825B1F5 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + F288032FE542996BFC1DFB8F /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-app-tvOS-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + 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"; + showEnvVarsInLog = 0; + }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -927,11 +735,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = B6E0D620E14A79C76BEEE7B0 /* Pods-app-appTests.debug.xcconfig */; -======= - baseConfigurationReference = 7C857A37CA77892FBE4CBCB4 /* Pods-app-appTests.debug.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = C32B8001F84C0C16DCE0924D /* Pods-app-appTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -954,11 +758,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = 6A7EDD883BA30EB3E77BA661 /* Pods-app-appTests.release.xcconfig */; -======= - baseConfigurationReference = 5D7CFBD33492245E6092DA58 /* Pods-app-appTests.release.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = 6983ACF71C2DB9CAD486BB74 /* Pods-app-appTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; @@ -978,11 +778,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = 39860E8D652FC0F60C40DA4E /* Pods-app.debug.xcconfig */; -======= - baseConfigurationReference = ABBB8754EE361CB0204F582C /* Pods-app.debug.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = 54670C63EF0E8A87F410DAB8 /* Pods-app.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -993,7 +789,7 @@ ENABLE_BITCODE = NO; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.9.7; + MARKETING_VERSION = 2.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1011,11 +807,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = 28A7638D2A4F8DB18E405DF8 /* Pods-app.release.xcconfig */; -======= - baseConfigurationReference = 280FE376BA9F68A835942339 /* Pods-app.release.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = 13E39C0A4346CA35EFAAB838 /* Pods-app.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -1025,7 +817,7 @@ DEVELOPMENT_TEAM = 76DV673YHX; INFOPLIST_FILE = app/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.9.7; + MARKETING_VERSION = 2.0.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -1042,11 +834,7 @@ }; 2D02E4971E0B4A5E006451C7 /* Debug */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = 0668F5F97ABB0B90C666286A /* Pods-app-tvOS.debug.xcconfig */; -======= - baseConfigurationReference = BFAE0434A1EC7279E958CD5B /* Pods-app-tvOS.debug.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = C6C4BFFAB9712335DC783C83 /* Pods-app-tvOS.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -1074,11 +862,7 @@ }; 2D02E4981E0B4A5E006451C7 /* Release */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = DB5D08EF48EFB3984BD34C97 /* Pods-app-tvOS.release.xcconfig */; -======= - baseConfigurationReference = CF4C3955B9AD96EFCFD90FF4 /* Pods-app-tvOS.release.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = 9DBBE2746B61F26784F9B797 /* Pods-app-tvOS.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -1106,11 +890,7 @@ }; 2D02E4991E0B4A5E006451C7 /* Debug */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = CF8CACB29D1B5EA56F49A758 /* Pods-app-tvOSTests.debug.xcconfig */; -======= - baseConfigurationReference = 78354E27627CAB6650C6B533 /* Pods-app-tvOSTests.debug.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = 235F48B6B850D19CA9BF2649 /* Pods-app-tvOSTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; @@ -1137,11 +917,7 @@ }; 2D02E49A1E0B4A5E006451C7 /* Release */ = { isa = XCBuildConfiguration; -<<<<<<< HEAD - baseConfigurationReference = CEA926A3EC369BA705616454 /* Pods-app-tvOSTests.release.xcconfig */; -======= - baseConfigurationReference = B7D610CEAB7656E9EF5F11F8 /* Pods-app-tvOSTests.release.xcconfig */; ->>>>>>> 15a27e5a7143706c672f33d77cf0ef0d309a22ee + baseConfigurationReference = 9A1C3A8DF053872D94D965DB /* Pods-app-tvOSTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES;