From 009c9f6d0d08302ef95210807a8691804e40064f Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Wed, 26 Dec 2018 10:55:47 +0300 Subject: [PATCH 1/2] Add react-native-safe-area to pods --- Podfile | 3 ++- Podfile.lock | 23 +++++++++++++------ WordPress/WordPress.xcodeproj/project.pbxproj | 6 +++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Podfile b/Podfile index a48bd720cf8b..7db7706e22eb 100644 --- a/Podfile +++ b/Podfile @@ -80,7 +80,7 @@ def shared_test_pods end def gutenberg_pod(name) - gutenberg_branch='master' + gutenberg_branch='issue/395-fix-content-bottom-inset-ios' pod name, :podspec => "https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/#{gutenberg_branch}/react-native-gutenberg-bridge/third-party-podspecs/#{name}.podspec.json" end @@ -100,6 +100,7 @@ target 'WordPress' do gutenberg_pod 'React' gutenberg_pod 'yoga' gutenberg_pod 'Folly' + gutenberg_pod 'react-native-safe-area' pod 'RNSVG', :git => 'https://github.com/wordpress-mobile/react-native-svg.git', :tag => '8.0.9-gb.0' pod 'RNTAztecView', :git => 'https://github.com/wordpress-mobile/react-native-aztec.git', :tag => 'v0.1.3' diff --git a/Podfile.lock b/Podfile.lock index b67cd4b11d94..89b2ad334524 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -122,6 +122,8 @@ PODS: - Reachability (3.2) - React (0.57.5): - React/Core (= 0.57.5) + - react-native-safe-area (0.5.0): + - React - React/Core (0.57.5): - yoga (= 0.57.5.React) - React/CxxBridge (0.57.5): @@ -219,7 +221,7 @@ DEPENDENCIES: - BuddyBuildSDK (= 1.0.17) - CocoaLumberjack (= 3.4.2) - Crashlytics (= 3.11.0) - - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) + - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - Gifu (= 3.2.0) - GiphyCoreSDK (~> 1.4.0) @@ -236,7 +238,8 @@ DEPENDENCIES: - OHHTTPStubs (= 6.1.0) - OHHTTPStubs/Swift (= 6.1.0) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) - RNSVG (from `https://github.com/wordpress-mobile/react-native-svg.git`, tag `8.0.9-gb.0`) - RNTAztecView (from `https://github.com/wordpress-mobile/react-native-aztec.git`, tag `v0.1.3`) - SimulatorStatusMagic @@ -250,7 +253,7 @@ DEPENDENCIES: - WordPressUI (~> 1.1) - WPMediaPicker (= 1.3.1) - wpxmlrpc (= 0.8.3) - - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) + - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) - ZendeskSDK (= 2.2.0) SPEC REPOS: @@ -300,12 +303,14 @@ EXTERNAL SOURCES: :git: https://github.com/Automattic/Automattic-Tracks-iOS.git :tag: 0.2.3 Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json Gutenberg: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v0.3.0 React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + react-native-safe-area: + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json RNSVG: :git: https://github.com/wordpress-mobile/react-native-svg.git :tag: 8.0.9-gb.0 @@ -313,7 +318,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/react-native-aztec.git :tag: v0.1.3 yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/master/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json CHECKOUT OPTIONS: Automattic-Tracks-iOS: @@ -322,6 +327,9 @@ CHECKOUT OPTIONS: Gutenberg: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v0.3.0 + react-native-safe-area: + :git: https://github.com/miyabi/react-native-safe-area.git + :tag: v0.5.0 RNSVG: :git: https://github.com/wordpress-mobile/react-native-svg.git :tag: 8.0.9-gb.0 @@ -360,6 +368,7 @@ SPEC CHECKSUMS: OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 React: 01aa04500b2957c2767e1dff9fe12e09444a467c + react-native-safe-area: 7dc92953fce43bf36ab5ecae2fb4ffa2bda9a203 RNSVG: 6d5813dd9c6a8e041e142abf1372faf012ce5759 RNTAztecView: 266ca6b864df41b55e942f23c4283a449a078af6 SimulatorStatusMagic: 0c0e711acef6e70dd8a0710962347635a9cdef24 @@ -377,6 +386,6 @@ SPEC CHECKSUMS: yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878 -PODFILE CHECKSUM: e3e2fb4e1b6d8d1dfdc68b522a0a98ff0f565963 +PODFILE CHECKSUM: 51f6a92febfea84b4b962e2b7dace6cae2d5deb3 COCOAPODS: 1.5.3 diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 935be4104c3e..374c9253df8b 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -4222,7 +4222,7 @@ name = Products; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + 29B97314FDCFA39411CA2CEA = { isa = PBXGroup; children = ( F14B5F6F208E648200439554 /* config */, @@ -8378,7 +8378,7 @@ bg, sk, ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + mainGroup = 29B97314FDCFA39411CA2CEA; productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; projectRoot = ""; @@ -8767,6 +8767,7 @@ "${PODS_ROOT}/ZendeskSDK/ZendeskSDK/4.2/ZendeskSDK.framework", "${BUILT_PRODUCTS_DIR}/glog/glog.framework", "${BUILT_PRODUCTS_DIR}/lottie-ios/Lottie.framework", + "${BUILT_PRODUCTS_DIR}/react-native-safe-area/react_native_safe_area.framework", "${BUILT_PRODUCTS_DIR}/wpxmlrpc/wpxmlrpc.framework", "${BUILT_PRODUCTS_DIR}/yoga/yoga.framework", ); @@ -8809,6 +8810,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZendeskSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lottie.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_safe_area.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wpxmlrpc.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework", ); From d320ce1c58ce3338a2f5f57511a3adc15089602e Mon Sep 17 00:00:00 2001 From: Pinar Olguc Date: Thu, 27 Dec 2018 10:35:07 +0300 Subject: [PATCH 2/2] Update gutenberg podspec branch as develop --- Podfile | 2 +- Podfile.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Podfile b/Podfile index 7db7706e22eb..85ba19a20b8f 100644 --- a/Podfile +++ b/Podfile @@ -80,7 +80,7 @@ def shared_test_pods end def gutenberg_pod(name) - gutenberg_branch='issue/395-fix-content-bottom-inset-ios' + gutenberg_branch='develop' pod name, :podspec => "https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/#{gutenberg_branch}/react-native-gutenberg-bridge/third-party-podspecs/#{name}.podspec.json" end diff --git a/Podfile.lock b/Podfile.lock index 89b2ad334524..3c3ecd6d32af 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -221,7 +221,7 @@ DEPENDENCIES: - BuddyBuildSDK (= 1.0.17) - CocoaLumberjack (= 3.4.2) - Crashlytics (= 3.11.0) - - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) + - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - Gifu (= 3.2.0) - GiphyCoreSDK (~> 1.4.0) @@ -238,8 +238,8 @@ DEPENDENCIES: - OHHTTPStubs (= 6.1.0) - OHHTTPStubs/Swift (= 6.1.0) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) - - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) - RNSVG (from `https://github.com/wordpress-mobile/react-native-svg.git`, tag `8.0.9-gb.0`) - RNTAztecView (from `https://github.com/wordpress-mobile/react-native-aztec.git`, tag `v0.1.3`) - SimulatorStatusMagic @@ -253,7 +253,7 @@ DEPENDENCIES: - WordPressUI (~> 1.1) - WPMediaPicker (= 1.3.1) - wpxmlrpc (= 0.8.3) - - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) + - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) - ZendeskSDK (= 2.2.0) SPEC REPOS: @@ -303,14 +303,14 @@ EXTERNAL SOURCES: :git: https://github.com/Automattic/Automattic-Tracks-iOS.git :tag: 0.2.3 Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json Gutenberg: :git: http://github.com/wordpress-mobile/gutenberg-mobile/ :tag: v0.3.0 React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json react-native-safe-area: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json RNSVG: :git: https://github.com/wordpress-mobile/react-native-svg.git :tag: 8.0.9-gb.0 @@ -318,7 +318,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/react-native-aztec.git :tag: v0.1.3 yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/issue/395-fix-content-bottom-inset-ios/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/develop/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json CHECKOUT OPTIONS: Automattic-Tracks-iOS: @@ -386,6 +386,6 @@ SPEC CHECKSUMS: yoga: f37b1edbd68be803f1dc4d57d40d8a5b277d8e2c ZendeskSDK: 44ee00338dd718495f0364369420ae11b389c878 -PODFILE CHECKSUM: 51f6a92febfea84b4b962e2b7dace6cae2d5deb3 +PODFILE CHECKSUM: 5874a5878798165bec723d9f1e3849013969ef8a COCOAPODS: 1.5.3