From c61c3dac5e94cb835cab0be344b3f5f3bc722f38 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 25 Jun 2019 12:48:06 +0100 Subject: [PATCH] Demonsrtate fix for https://github.com/facebook/react-native/issues/25349 --- ios/AwesomeProject.xcodeproj/project.pbxproj | 71 ++++---- ios/Podfile | 1 - ios/Podfile.lock | 162 ++++++++++--------- package.json | 2 +- yarn.lock | 89 +++++----- 5 files changed, 171 insertions(+), 154 deletions(-) diff --git a/ios/AwesomeProject.xcodeproj/project.pbxproj b/ios/AwesomeProject.xcodeproj/project.pbxproj index 1c57a1a..1d9d62b 100644 --- a/ios/AwesomeProject.xcodeproj/project.pbxproj +++ b/ios/AwesomeProject.xcodeproj/project.pbxproj @@ -12,14 +12,14 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 2370906DB644DC57AA289AAD /* Pods_AwesomeProject_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C2525489CB8F127F37D9FE6 /* Pods_AwesomeProject_tvOS.framework */; }; + 24A51091E0798DE2C28359C1 /* Pods_AwesomeProject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E1CF33F66F6BBBE95249D86 /* Pods_AwesomeProject.framework */; }; 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 */; }; 2DCD954D1E0B4F2C00145EB5 /* AwesomeProjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* AwesomeProjectTests.m */; }; - 46FE87735B5684A20E7305F4 /* Pods_AwesomeProject_tvOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B30BA2FE5A638491C5AE884 /* Pods_AwesomeProject_tvOSTests.framework */; }; - 61CDD0F9976EC26AC11D11EA /* Pods_AwesomeProjectTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD122EB2F748FD5C864061E5 /* Pods_AwesomeProjectTests.framework */; }; - 91F8743436960148B95D99B2 /* Pods_AwesomeProject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 87654E3264B89F7DFE0920AC /* Pods_AwesomeProject.framework */; }; - A82E2F4B7620713A59A0D183 /* Pods_AwesomeProject_tvOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D15A437A69B8300DB69CDDDC /* Pods_AwesomeProject_tvOS.framework */; }; + 80F28872C03B3F55D501D6C2 /* Pods_AwesomeProject_tvOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 928C990704BB09AEE6A158B3 /* Pods_AwesomeProject_tvOSTests.framework */; }; + 8E8377C8A00EDF2B36D1830C /* Pods_AwesomeProjectTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 880EBC9D9DB6D8FC99CA5492 /* Pods_AwesomeProjectTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -55,13 +55,13 @@ 1944EB5C591EA6109C4E5CDB /* Pods-AwesomeProjectTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProjectTests.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProjectTests/Pods-AwesomeProjectTests.release.xcconfig"; sourceTree = ""; }; 2D02E47B1E0B4A5D006451C7 /* AwesomeProject-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AwesomeProject-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* AwesomeProject-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AwesomeProject-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2E1CF33F66F6BBBE95249D86 /* Pods_AwesomeProject.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProject.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 46D62644DAB678C798EB4B6D /* Pods-AwesomeProject-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProject-tvOSTests/Pods-AwesomeProject-tvOSTests.release.xcconfig"; sourceTree = ""; }; 519815A6326D030E08AB01DE /* Pods-AwesomeProject-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject-tvOS.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProject-tvOS/Pods-AwesomeProject-tvOS.release.xcconfig"; sourceTree = ""; }; - 6B30BA2FE5A638491C5AE884 /* Pods_AwesomeProject_tvOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProject_tvOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 87654E3264B89F7DFE0920AC /* Pods_AwesomeProject.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProject.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6C2525489CB8F127F37D9FE6 /* Pods_AwesomeProject_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProject_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 880EBC9D9DB6D8FC99CA5492 /* Pods_AwesomeProjectTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProjectTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 928C990704BB09AEE6A158B3 /* Pods_AwesomeProject_tvOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProject_tvOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9F8FD6A21A3DA96763A300B3 /* Pods-AwesomeProject.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject.release.xcconfig"; path = "Target Support Files/Pods-AwesomeProject/Pods-AwesomeProject.release.xcconfig"; sourceTree = ""; }; - AD122EB2F748FD5C864061E5 /* Pods_AwesomeProjectTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProjectTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D15A437A69B8300DB69CDDDC /* Pods_AwesomeProject_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AwesomeProject_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D441D0261D70DB24518224EF /* Pods-AwesomeProjectTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProjectTests.debug.xcconfig"; path = "Target Support Files/Pods-AwesomeProjectTests/Pods-AwesomeProjectTests.debug.xcconfig"; sourceTree = ""; }; E344D53D428FD8AD3A0111E4 /* Pods-AwesomeProject-tvOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AwesomeProject-tvOSTests.debug.xcconfig"; path = "Target Support Files/Pods-AwesomeProject-tvOSTests/Pods-AwesomeProject-tvOSTests.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; @@ -74,7 +74,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 61CDD0F9976EC26AC11D11EA /* Pods_AwesomeProjectTests.framework in Frameworks */, + 8E8377C8A00EDF2B36D1830C /* Pods_AwesomeProjectTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -82,7 +82,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 91F8743436960148B95D99B2 /* Pods_AwesomeProject.framework in Frameworks */, + 24A51091E0798DE2C28359C1 /* Pods_AwesomeProject.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -90,7 +90,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A82E2F4B7620713A59A0D183 /* Pods_AwesomeProject_tvOS.framework in Frameworks */, + 2370906DB644DC57AA289AAD /* Pods_AwesomeProject_tvOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -98,7 +98,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 46FE87735B5684A20E7305F4 /* Pods_AwesomeProject_tvOSTests.framework in Frameworks */, + 80F28872C03B3F55D501D6C2 /* Pods_AwesomeProject_tvOSTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -141,10 +141,10 @@ children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, ED2971642150620600B7C4FE /* JavaScriptCore.framework */, - 87654E3264B89F7DFE0920AC /* Pods_AwesomeProject.framework */, - D15A437A69B8300DB69CDDDC /* Pods_AwesomeProject_tvOS.framework */, - 6B30BA2FE5A638491C5AE884 /* Pods_AwesomeProject_tvOSTests.framework */, - AD122EB2F748FD5C864061E5 /* Pods_AwesomeProjectTests.framework */, + 2E1CF33F66F6BBBE95249D86 /* Pods_AwesomeProject.framework */, + 6C2525489CB8F127F37D9FE6 /* Pods_AwesomeProject_tvOS.framework */, + 928C990704BB09AEE6A158B3 /* Pods_AwesomeProject_tvOSTests.framework */, + 880EBC9D9DB6D8FC99CA5492 /* Pods_AwesomeProjectTests.framework */, ); name = Frameworks; sourceTree = ""; @@ -230,7 +230,7 @@ 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - C6422BD1208C7D1530A4694C /* [CP] Embed Pods Frameworks */, + C25CC71C5C24D3E66696F31D /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -476,7 +476,7 @@ 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; }; - C6422BD1208C7D1530A4694C /* [CP] Embed Pods Frameworks */ = { + C25CC71C5C24D3E66696F31D /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -486,19 +486,18 @@ "${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework", "${BUILT_PRODUCTS_DIR}/Folly/folly.framework", "${BUILT_PRODUCTS_DIR}/React-Core/React.framework", - "${BUILT_PRODUCTS_DIR}/React-DevSupport/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTActionSheet/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTAnimation/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTBlob/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTImage/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTLinking/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTNetwork/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTSettings/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTText/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTVibration/React.framework", - "${BUILT_PRODUCTS_DIR}/React-RCTWebSocket/React.framework", + "${BUILT_PRODUCTS_DIR}/React-DevSupport/DevSupport.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTActionSheet/RCTActionSheet.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTAnimation/RCTAnimation.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTBlob/RCTBlob.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTImage/RCTImage.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTLinking/RCTLinking.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTNetwork/RCTNetwork.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTSettings/RCTSettings.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTText/RCTText.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTVibration/RCTVibration.framework", + "${BUILT_PRODUCTS_DIR}/React-RCTWebSocket/RCTWebSocket.framework", "${BUILT_PRODUCTS_DIR}/React-cxxreact/cxxreact.framework", - "${BUILT_PRODUCTS_DIR}/React-fishhook/fishhook.framework", "${BUILT_PRODUCTS_DIR}/React-jsi/jsi.framework", "${BUILT_PRODUCTS_DIR}/React-jsiexecutor/jsireact.framework", "${BUILT_PRODUCTS_DIR}/React-jsinspector/jsinspector.framework", @@ -510,8 +509,18 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/folly.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DevSupport.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTActionSheet.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTAnimation.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTBlob.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTImage.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTLinking.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTNetwork.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTSettings.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTText.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTVibration.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RCTWebSocket.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/cxxreact.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fishhook.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsi.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsireact.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/jsinspector.framework", diff --git a/ios/Podfile b/ios/Podfile index 595032b..6af2c09 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -9,7 +9,6 @@ target 'AwesomeProject' do pod 'React', :path => '../node_modules/react-native/' pod 'React-Core', :path => '../node_modules/react-native/React' pod 'React-DevSupport', :path => '../node_modules/react-native/React' - pod 'React-fishhook', :path => '../node_modules/react-native/Libraries/fishhook' pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6334365..6c8f970 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -11,77 +11,87 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - React (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-DevSupport (= 0.60.0-rc.2) - - React-RCTActionSheet (= 0.60.0-rc.2) - - React-RCTAnimation (= 0.60.0-rc.2) - - React-RCTBlob (= 0.60.0-rc.2) - - React-RCTImage (= 0.60.0-rc.2) - - React-RCTLinking (= 0.60.0-rc.2) - - React-RCTNetwork (= 0.60.0-rc.2) - - React-RCTSettings (= 0.60.0-rc.2) - - React-RCTText (= 0.60.0-rc.2) - - React-RCTVibration (= 0.60.0-rc.2) - - React-RCTWebSocket (= 0.60.0-rc.2) - - React-Core (0.60.0-rc.2): + - React (1000.0.0): + - React-Core (= 1000.0.0) + - React-DevSupport (= 1000.0.0) + - React-RCTActionSheet (= 1000.0.0) + - React-RCTAnimation (= 1000.0.0) + - React-RCTBlob (= 1000.0.0) + - React-RCTImage (= 1000.0.0) + - React-RCTLinking (= 1000.0.0) + - React-RCTNetwork (= 1000.0.0) + - React-RCTSettings (= 1000.0.0) + - React-RCTText (= 1000.0.0) + - React-RCTVibration (= 1000.0.0) + - React-RCTWebSocket (= 1000.0.0) + - React-Core (1000.0.0): - Folly (= 2018.10.22.00) - - React-cxxreact (= 0.60.0-rc.2) - - React-jsiexecutor (= 0.60.0-rc.2) - - yoga (= 0.60.0-rc.2.React) - - React-cxxreact (0.60.0-rc.2): + - glog + - React-Core/Default (= 1000.0.0) + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/Default (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-cxxreact (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsinspector (= 0.60.0-rc.2) - - React-DevSupport (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTWebSocket (= 0.60.0-rc.2) - - React-fishhook (0.60.0-rc.2) - - React-jsi (0.60.0-rc.2): + - React-jsinspector (= 1000.0.0) + - React-DevSupport (1000.0.0): + - React-Core (= 1000.0.0) + - React-jsinspector (= 1000.0.0) + - React-RCTWebSocket (= 1000.0.0) + - React-jsi (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsi/Default (= 0.60.0-rc.2) - - React-jsi/Default (0.60.0-rc.2): + - React-jsi/Default (= 1000.0.0) + - React-jsi/Default (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsiexecutor (0.60.0-rc.2): + - React-jsiexecutor (1000.0.0): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.60.0-rc.2) - - React-jsi (= 0.60.0-rc.2) - - React-jsinspector (0.60.0-rc.2) - - React-RCTActionSheet (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTAnimation (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTBlob (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTNetwork (= 0.60.0-rc.2) - - React-RCTWebSocket (= 0.60.0-rc.2) - - React-RCTImage (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTNetwork (= 0.60.0-rc.2) - - React-RCTLinking (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTNetwork (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTSettings (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTText (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTVibration (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-RCTWebSocket (0.60.0-rc.2): - - React-Core (= 0.60.0-rc.2) - - React-fishhook (= 0.60.0-rc.2) - - yoga (0.60.0-rc.2.React) + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsinspector (1000.0.0) + - React-RCTActionSheet (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTAnimation (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTBlob (1000.0.0): + - React-Core (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-RCTNetwork (= 1000.0.0) + - React-RCTWebSocket (= 1000.0.0) + - React-RCTImage (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTNetwork (= 1000.0.0) + - React-RCTLinking (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTNetwork (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTSettings (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTText (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTVibration (1000.0.0): + - React-Core (= 1000.0.0) + - React-RCTWebSocket (1000.0.0): + - React-Core (= 1000.0.0) + - yoga (1000.0.0.React) DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) @@ -91,7 +101,6 @@ DEPENDENCIES: - React-Core (from `../node_modules/react-native/React`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - React-DevSupport (from `../node_modules/react-native/React`) - - React-fishhook (from `../node_modules/react-native/Libraries/fishhook`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) @@ -126,8 +135,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/cxxreact" React-DevSupport: :path: "../node_modules/react-native/React" - React-fishhook: - :path: "../node_modules/react-native/Libraries/fishhook" React-jsi: :path: "../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: @@ -162,26 +169,25 @@ SPEC CHECKSUMS: DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - React: 6deda18ff1027c9564666b48a6645cf5e1b6ae1b - React-Core: 48fa2db84408bffa044a165b3edf06dbe2bde874 - React-cxxreact: 29cdecf7744eaada444880f510e91a8539ba2cdd - React-DevSupport: 2fd6dbfac285638b9a22530c805f5e7ed764112f - React-fishhook: 9942609c1b46c19c9f9055bc119d0ae849998dc9 - React-jsi: 8bd119b1fbb6269eb87964d15cfb337d3354e8b6 - React-jsiexecutor: 9d35222510018988f0f0c84ca642d7046df8999d - React-jsinspector: 7009cc1341c0dd930d837c99a5b141afae375350 - React-RCTActionSheet: 27107aded13596ef19af42eca9eeca5024c81a6d - React-RCTAnimation: c079dd90a63a81c62df48b8a81f073d0b49163d6 - React-RCTBlob: 55432f6873150b4c985ca09d8ef33333498b1b8c - React-RCTImage: 5b722ef8a733ffc892068253a363e281f70a2850 - React-RCTLinking: fd1d06ff711fa0c25456a0f1d11fc86fc492c84d - React-RCTNetwork: 8e182c2ea92b04cac478e9c10e7839d74962d78d - React-RCTSettings: e9ebd2930c1fa540a8a0a15c142050d30bfe4133 - React-RCTText: 59ac5b0ee637f2aea1ba33f7e1716eafad7dd368 - React-RCTVibration: 3e60de5f11f68e27252569548cbba3e0b3e1e6e2 - React-RCTWebSocket: bbb33bdfe5c3cabdc2fd0fdfdeba49a1f587132d - yoga: 7c0073d00a904af0e5e221c2ffecf4a293cf4369 + React: e1ef28ef21daf2da1af0c9d88195a54fd74a2eb2 + React-Core: b7a236118df7035049fd49fbc5255ed8c8708841 + React-cxxreact: 913cfb686cd2a366d2c31be1ff8a09669456ce3f + React-DevSupport: 0dca55c3da495725b63b4760fd499690969c0320 + React-jsi: 9d62106d1304fd2bdb80be842febbebd29db562b + React-jsiexecutor: c844d16e77292fa34367bfacb6ec5fc515098ed4 + React-jsinspector: 06659b165c4378d7c9652801290c18838bb10deb + React-RCTActionSheet: 2c6934a6033b5a9e02ed6a250299cac768808aa5 + React-RCTAnimation: 1ad9e1c67d4959722a13e1a41e463b55983319ca + React-RCTBlob: 473e28f83dcf178f803ea31abb6712c6ecb302df + React-RCTImage: 8bfc8f39ab19da3e37bff570a83bf9ea3dd1d26c + React-RCTLinking: 72391c8b90136dea6ef15fe036b19266b33ba93d + React-RCTNetwork: 5c8960631158d5b6b46aae1810fe090815eb6b6e + React-RCTSettings: f9d4fab4e892b41a968184bd11bef49b6a420b3d + React-RCTText: 40d92d75c751766028f591d21688149469c1801d + React-RCTVibration: 31fc7394b07aa50b07a4835a920a842bc59ff673 + React-RCTWebSocket: 59aac06e4c18918d4774dfad7975cbebc87f4a1f + yoga: 1d994b92ab63d6cf591125983a87ee6613cdb422 -PODFILE CHECKSUM: 0c4460e1f65589240ac96befee37f5821f79f561 +PODFILE CHECKSUM: 3940059e7bcee7bc57dc4d4e8b7439d1a52b737c COCOAPODS: 1.7.1 diff --git a/package.json b/package.json index bca90d6..d466e04 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "dependencies": { "react": "16.8.6", - "react-native": "0.60.0-rc.2" + "react-native": "jtreanor/react-native#fix/cocoapods-frameworks" }, "devDependencies": { "@babel/core": "^7.4.5", diff --git a/yarn.lock b/yarn.lock index 6c95e41..ca02a90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -666,14 +666,20 @@ integrity sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A== "@hapi/joi@^15.0.3": - version "15.0.3" - resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.0.3.tgz#e94568fd859e5e945126d5675e7dd218484638a7" - integrity sha512-z6CesJ2YBwgVCi+ci8SI8zixoj8bGFn/vZb9MBPbSyoxsS2PnWYjHcyTM17VLK6tx64YVK38SDIh10hJypB+ig== + version "15.1.0" + resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.0.tgz#940cb749b5c55c26ab3b34ce362e82b6162c8e7a" + integrity sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ== dependencies: "@hapi/address" "2.x.x" "@hapi/hoek" "6.x.x" + "@hapi/marker" "1.x.x" "@hapi/topo" "3.x.x" +"@hapi/marker@1.x.x": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@hapi/marker/-/marker-1.0.0.tgz#65b0b2b01d1be06304886ce9b4b77b1bfb21a769" + integrity sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA== + "@hapi/topo@3.x.x": version "3.1.0" resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.0.tgz#5c47cd9637c2953db185aa957a27bcb2a8b7a6f8" @@ -1498,9 +1504,9 @@ browser-resolve@^1.11.3: resolve "1.1.7" bser@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" - integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= + version "2.1.0" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz#65fc784bf7f87c009b973c12db6546902fa9c7b5" + integrity sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg== dependencies: node-int64 "^0.4.0" @@ -2866,12 +2872,12 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" http-errors@~1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== dependencies: depd "~1.1.2" - inherits "2.0.3" + inherits "2.0.4" setprototypeof "1.1.1" statuses ">= 1.5.0 < 2" toidentifier "1.0.0" @@ -2951,16 +2957,11 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" @@ -3136,7 +3137,7 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -4292,9 +4293,9 @@ minizlib@^1.2.1: minipass "^2.2.1" mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ== + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== dependencies: for-in "^1.0.2" is-extendable "^1.0.1" @@ -5010,10 +5011,9 @@ react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== -react-native@0.60.0-rc.2: - version "0.60.0-rc.2" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.0-rc.2.tgz#2ebb8c0d6d0861e44e07ae6e3ab3cad8b7d9978d" - integrity sha512-o0BxbebnnUV3FC00ZAAj2i23q5z3QRmLPRKh1PinE/fn86LOGyecNsiUMAuyg94/EtGY/DSZAOj+j0eJ0VLljw== +react-native@jtreanor/react-native#fix/cocoapods-frameworks: + version "1000.0.0" + resolved "https://codeload.github.com/jtreanor/react-native/tar.gz/6d3c751a9cd6553eabee17a752239f187e21362e" dependencies: "@babel/runtime" "^7.0.0" "@react-native-community/cli" "2.0.0-rc.2" @@ -5037,6 +5037,7 @@ react-native@0.60.0-rc.2: promise "^7.1.1" prop-types "^15.7.2" react-devtools-core "^3.6.0" + react-refresh "0.0.7" regenerator-runtime "^0.13.2" scheduler "0.14.0" stacktrace-parser "^0.1.3" @@ -5050,6 +5051,11 @@ react-proxy@^1.1.7: lodash "^4.6.1" react-deep-force-update "^1.0.0" +react-refresh@0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.0.7.tgz#0d900c2fd605a89624e4ec79ec1ad786246e1f55" + integrity sha512-AOUyJUlII1ZcrOt5k72dkSleQeLwFOZqVvkMkZO4uLeU2Qsc2EEJN1MRyyHsnl9LHxBlVJ0gBnIFIJ0w8hsPhQ== + react-test-renderer@16.8.6: version "16.8.6" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1" @@ -5292,7 +5298,14 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0: +resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" + integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw== + dependencies: + path-parse "^1.0.6" + +resolve@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw== @@ -5474,20 +5487,10 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE= - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg== +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== dependencies: extend-shallow "^2.0.1" is-extendable "^0.1.1" @@ -6067,14 +6070,14 @@ unicode-property-aliases-ecmascript@^1.0.4: integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== dependencies: arr-union "^3.1.0" get-value "^2.0.6" is-extendable "^0.1.1" - set-value "^0.4.3" + set-value "^2.0.1" universalify@^0.1.0: version "0.1.2"