From 394b1e8c2ad8fde6f7a7282f48358add5859d9e2 Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Tue, 14 May 2024 14:29:25 +0200 Subject: [PATCH 1/3] chore: bump Podfile.lock for example and test apps --- Example/ios/Podfile.lock | 5 +++-- FabricExample/ios/Podfile.lock | 39 ++++++++++++++++++++++++++++------ TestsExample/ios/Podfile.lock | 7 +++--- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/Example/ios/Podfile.lock b/Example/ios/Podfile.lock index 99c38dd682..e2c9e79780 100644 --- a/Example/ios/Podfile.lock +++ b/Example/ios/Podfile.lock @@ -435,9 +435,10 @@ PODS: - RCT-Folly (= 2021.07.22.00) - React-Core - ReactCommon/turbomodule/core - - RNScreens (3.31.0-rc.1): + - RNScreens (3.31.1): - RCT-Folly (= 2021.07.22.00) - React-Core + - React-RCTImage - RNVectorIcons (8.1.0): - React-Core - SocketRocket (0.6.1) @@ -636,7 +637,7 @@ SPEC CHECKSUMS: ReactCommon: 4b2bdcb50a3543e1c2b2849ad44533686610826d RNGestureHandler: 38aa38413896620338948fbb5c90579a7b1c3fde RNReanimated: 0f8173d46f45c2f690c416dff10206832631571d - RNScreens: 6b4c54b02d91a4eb9ea00bec90a7872af5612c8f + RNScreens: 93ae3be2f119d955620f9bbb39ad372adb53b7a9 RNVectorIcons: 31cebfcf94e8cf8686eb5303ae0357da64d7a5a4 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981 diff --git a/FabricExample/ios/Podfile.lock b/FabricExample/ios/Podfile.lock index 12eae0c9e8..3cf1b975a6 100644 --- a/FabricExample/ios/Podfile.lock +++ b/FabricExample/ios/Podfile.lock @@ -1229,7 +1229,7 @@ PODS: - React-logger (= 0.74.0-rc.2) - React-perflogger (= 0.74.0-rc.2) - React-utils (= 0.74.0-rc.2) - - RNScreens (3.31.0-rc.1): + - RNGestureHandler (2.16.1): - DoubleConversion - glog - hermes-engine @@ -1249,9 +1249,8 @@ PODS: - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - RNScreens/common (= 3.31.0-rc.1) - Yoga - - RNScreens/common (3.31.0-rc.1): + - RNScreens (3.31.1): - DoubleConversion - glog - hermes-engine @@ -1267,6 +1266,30 @@ PODS: - React-ImageManager - React-NativeModulesApple - React-RCTFabric + - React-RCTImage + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNScreens/common (= 3.31.1) + - Yoga + - RNScreens/common (3.31.1): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-RCTImage - React-rendererdebug - React-utils - ReactCommon/turbomodule/bridging @@ -1332,6 +1355,7 @@ DEPENDENCIES: - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) + - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNScreens (from `../node_modules/react-native-screens`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) @@ -1449,14 +1473,16 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/react/utils" ReactCommon: :path: "../node_modules/react-native/ReactCommon" + RNGestureHandler: + :path: "../node_modules/react-native-gesture-handler" RNScreens: :path: "../node_modules/react-native-screens" Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost: 26fad476bfa736552bbfa698a06cc530475c1505 - DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 + boost: d3f49c53809116a5d38da093a8aa78bf551aed09 + DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 FBLazyVector: fa59cfcc9893760f58a0af6f5c25d5736c6d0b14 fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120 glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 @@ -1509,7 +1535,8 @@ SPEC CHECKSUMS: React-runtimescheduler: 29aa1c59c7da4d7275c9757d4f26869e2954a8bd React-utils: b3fdffd65d9f66ae79435e6633b8a634ac67baf7 ReactCommon: a4c502bf9d6b69ac8a1961bce7ae32a1e8439555 - RNScreens: a68878603ae871d339f683bc683803545422986f + RNGestureHandler: 07b0babf8a26ea79729ae5c1990f8807e098970b + RNScreens: 63fe8222c172a79f5c30dd1aefaeb369c6eb57b6 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d Yoga: f78d50661f1d9906929cddb3641febd14068f090 diff --git a/TestsExample/ios/Podfile.lock b/TestsExample/ios/Podfile.lock index 1e229f7f2b..0bfd8601bb 100644 --- a/TestsExample/ios/Podfile.lock +++ b/TestsExample/ios/Podfile.lock @@ -1064,10 +1064,11 @@ PODS: - RCT-Folly (= 2022.05.16.00) - React-Core - ReactCommon/turbomodule/core - - RNScreens (3.31.0-rc.1): + - RNScreens (3.31.1): - glog - RCT-Folly (= 2022.05.16.00) - React-Core + - React-RCTImage - SocketRocket (0.6.1) - Yoga (1.14.0) @@ -1243,7 +1244,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: d3f49c53809116a5d38da093a8aa78bf551aed09 - DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 + DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7 FBReactNativeSpec: d0086a479be91c44ce4687a962956a352d2dc697 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 @@ -1294,7 +1295,7 @@ SPEC CHECKSUMS: ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522 RNGestureHandler: 61bfdfc05db9b79dd61f894dcd29d3dcc6db3c02 RNReanimated: e7abe58f02a10c8b619db32b6bf33507420a9f86 - RNScreens: 794330587bf2cc284138990677584eb7b105c188 + RNScreens: 79c1020e7f52f4edde5ad96540f6e33c8b9b3b6c SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70 From b5913915b3e9db89a7cece80533794adf4f8448b Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Wed, 15 May 2024 15:43:38 +0200 Subject: [PATCH 2/3] chore: run pod install in TVExample --- TVOSExample/ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TVOSExample/ios/Podfile.lock b/TVOSExample/ios/Podfile.lock index 6a0a251242..e7257cfdc8 100644 --- a/TVOSExample/ios/Podfile.lock +++ b/TVOSExample/ios/Podfile.lock @@ -396,7 +396,7 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: 7fd7485ebdd1572a8faf2a24509ed2c37f8db77f - FBReactNativeSpec: 816c8516ebc6ed8a463b95b6f27bc36114d20222 + FBReactNativeSpec: d249a47a226f312f1ac6752a644c0f6a8fd0325f glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c RCTRequired: 587385d66e6bbb5632ade820568adf71edb60545 From e8dd3d6688492b9db4aa0abb7c41402e73a35696 Mon Sep 17 00:00:00 2001 From: Maciej Stosio Date: Wed, 15 May 2024 15:52:28 +0200 Subject: [PATCH 3/3] chore: update podfile.lock after resolving conflicts --- FabricTestExample/ios/Podfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FabricTestExample/ios/Podfile.lock b/FabricTestExample/ios/Podfile.lock index c5c52dc946..52d8811cc7 100644 --- a/FabricTestExample/ios/Podfile.lock +++ b/FabricTestExample/ios/Podfile.lock @@ -1564,8 +1564,8 @@ SPEC CHECKSUMS: RNReanimated: 2f33b2f8c79c456ce3858a7cd2e07460eb5f61e0 RNScreens: 63fe8222c172a79f5c30dd1aefaeb369c6eb57b6 SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d - Yoga: 348f8b538c3ed4423eb58a8e5730feec50bce372 + Yoga: b9a182ab00cf25926e7f79657d08c5d23c2d03b0 PODFILE CHECKSUM: 67b3d295da87c29349179e51bb3526b67059b646 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2