From 425e33835711bbd9f1e5036176f440c147cede63 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Tue, 15 Mar 2022 10:49:40 +0100 Subject: [PATCH] Mobile - Update Aztec to test --- .../GutenbergDemo.xcodeproj/project.pbxproj | 8 +++--- packages/react-native-editor/ios/Podfile | 2 ++ packages/react-native-editor/ios/Podfile.lock | 28 ++++++++++++------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj index a08280d71e173f..3847c63a818821 100644 --- a/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj +++ b/packages/react-native-editor/ios/GutenbergDemo.xcodeproj/project.pbxproj @@ -329,6 +329,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-GutenbergDemo/Pods-GutenbergDemo-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS-framework/Aztec.framework", "${BUILT_PRODUCTS_DIR}/BVLinearGradient/BVLinearGradient.framework", "${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework", "${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework", @@ -359,7 +360,6 @@ "${BUILT_PRODUCTS_DIR}/React-logger/logger.framework", "${BUILT_PRODUCTS_DIR}/React-perflogger/reactperflogger.framework", "${BUILT_PRODUCTS_DIR}/ReactCommon/ReactCommon.framework", - "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", "${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework", "${BUILT_PRODUCTS_DIR}/fmt/fmt.framework", "${BUILT_PRODUCTS_DIR}/glog/glog.framework", @@ -373,6 +373,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BVLinearGradient.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework", @@ -403,7 +404,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/logger.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/reactperflogger.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactCommon.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fmt.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", @@ -449,6 +449,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-GutenbergDemo-GutenbergDemoTests/Pods-GutenbergDemo-GutenbergDemoTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS-framework/Aztec.framework", "${BUILT_PRODUCTS_DIR}/BVLinearGradient/BVLinearGradient.framework", "${BUILT_PRODUCTS_DIR}/DoubleConversion/DoubleConversion.framework", "${BUILT_PRODUCTS_DIR}/FBReactNativeSpec/FBReactNativeSpec.framework", @@ -479,7 +480,6 @@ "${BUILT_PRODUCTS_DIR}/React-logger/logger.framework", "${BUILT_PRODUCTS_DIR}/React-perflogger/reactperflogger.framework", "${BUILT_PRODUCTS_DIR}/ReactCommon/ReactCommon.framework", - "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", "${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework", "${BUILT_PRODUCTS_DIR}/fmt/fmt.framework", "${BUILT_PRODUCTS_DIR}/glog/glog.framework", @@ -493,6 +493,7 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BVLinearGradient.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DoubleConversion.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBReactNativeSpec.framework", @@ -523,7 +524,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/logger.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/reactperflogger.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactCommon.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fmt.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", diff --git a/packages/react-native-editor/ios/Podfile b/packages/react-native-editor/ios/Podfile index 88d0963b5d5235..6cd7763172fadc 100644 --- a/packages/react-native-editor/ios/Podfile +++ b/packages/react-native-editor/ios/Podfile @@ -3,6 +3,8 @@ project 'GutenbergDemo.xcodeproj' require_relative '../../../node_modules/react-native/scripts/react_native_pods' require_relative '../../../node_modules/@react-native-community/cli-platform-ios/native_modules' +pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :commit => 'af4c4635a2cba9825cedefff90512cdf13b24d43' + # Uncomment the next line to define a global platform for your project app_ios_deployment_target = Gem::Version.new('13.0') platform :ios, app_ios_deployment_target.version diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index 9beba3d38ed366..67356295061e8a 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -393,12 +393,12 @@ DEPENDENCIES: - RNScreens (from `../../../node_modules/react-native-screens`) - RNSVG (from `../../../node_modules/react-native-svg`) - RNTAztecView (from `../../react-native-aztec`) + - WordPress-Aztec-iOS (from `https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git`, commit `af4c4635a2cba9825cedefff90512cdf13b24d43`) - Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: trunk: - fmt - - WordPress-Aztec-iOS EXTERNAL SOURCES: boost: @@ -493,9 +493,17 @@ EXTERNAL SOURCES: :path: "../../../node_modules/react-native-svg" RNTAztecView: :path: "../../react-native-aztec" + WordPress-Aztec-iOS: + :commit: af4c4635a2cba9825cedefff90512cdf13b24d43 + :git: https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git Yoga: :path: "../../../node_modules/react-native/ReactCommon/yoga" +CHECKOUT OPTIONS: + WordPress-Aztec-iOS: + :commit: af4c4635a2cba9825cedefff90512cdf13b24d43 + :git: https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git + SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 BVLinearGradient: f6eff3552b842aac99ff6f21197e57f87cfd956d @@ -504,7 +512,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 18438b1c04ce502ed681cd19db3f4508964c082a fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 5337263514dd6f09803962437687240c5dc39aa4 - Gutenberg: 642c7d81af8a9a271b507aa0e7aab25f4ef00a6a + Gutenberg: 73f91585dcc713fdf0e7ce028f2686a3308b0549 RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9 RCTRequired: 5e9e85f48da8dd447f5834ce14c6799ea8c7f41a RCTTypeSafety: aba333d04d88d1f954e93666a08d7ae57a87ab30 @@ -519,12 +527,12 @@ SPEC CHECKSUMS: React-logger: faee236598b0f7e1a5e3b68577016ac451f1f993 react-native-blur: ef741a08d020010ba65e411be0ab82d1d325e7ad react-native-get-random-values: 6296ac9e84928625ffb34ca74ab684bbda8747a8 - react-native-keyboard-aware-scroll-view: 374b637c8684d7de50bd930df1a2d2b8fd49daa5 + react-native-keyboard-aware-scroll-view: 0bc6c2dfe9056935a40dc1a70e764b7a1bbf6568 react-native-safe-area: c9cf765aa2dd96159476a99633e7d462ce5bb94f - react-native-safe-area-context: 12756eb7af017b6ff6b4f50dc5a55eab299c62fd + react-native-safe-area-context: fb0338ddfcd1b163e1506d5ebd9b4444348e7501 react-native-slider: d4c3367c5db5d2bec3ac0ab9d15ebb73d896034c - react-native-video: 2ad952d1a9ce83e058dcb4a1800af3a99cb7edee - react-native-webview: 5189276d033e3d3c5292d22e5a66ec48c9b2b04b + react-native-video: 0b09cc469df0249509def5dc1484e0419342de9b + react-native-webview: 8480d6e71b06e3d1d2fd644de6313108e7b65f90 React-perflogger: 5ab487cacfe6ec19bfe3d3f8072bf71eb07d63da React-RCTActionSheet: 03f25695e095fb5aa003828620943c74cc281fec React-RCTAnimation: eaf82da39f0c36fb0ef2a28df797c5f73a2a98ea @@ -537,16 +545,16 @@ SPEC CHECKSUMS: React-RCTVibration: 3e815c3d2dd2e0e931b68595b5b92d23ba38b3fb React-runtimeexecutor: 393e26602c1b248683372051e34db63e359e3b01 ReactCommon: c0263c1a41509aeb94be3214fa7bc3b71eae5ef6 - RNCClipboard: 6e20baf63bfe3515c2b719a8c3d6797718098663 - RNCMaskedView: 579fdb1e0abb33cc0d38ee8d4942df9976a0533e + RNCClipboard: def60a5048b473addc5dbac5abee5d896c08ec1b + RNCMaskedView: 1c8ad5b657280e8c7ebf7866277e1ff820ae48c9 RNGestureHandler: 73184394c98d543e6a24ab26dba4169824e85288 RNReanimated: 6aee4bed42a400d9472b7e843762ab4119cf201c RNScreens: ec0e85d1babdd61d7ec78c98072d9e6b62d96ff6 RNSVG: b3b9c40381636e5116894398d72a830be15b7258 - RNTAztecView: 1bbc9f43c8b5746c0ae8a0998430bd07cf21b2b6 + RNTAztecView: 9c5f318a1a73d246160432dd478ca4d1fcb0a1e5 WordPress-Aztec-iOS: 7d11d598f14c82c727c08b56bd35fbeb7dafb504 Yoga: 9a08effa851c1d8cc1647691895540bc168ea65f -PODFILE CHECKSUM: 563423e4045de5607d9ba4dd3a53595bb1a8c8cc +PODFILE CHECKSUM: d53746c3a8e3fd9cd11fca4eb0508d682b333c9a COCOAPODS: 1.10.1