diff --git a/Podfile b/Podfile index 9636a00bb70b..1fbba2d9172b 100644 --- a/Podfile +++ b/Podfile @@ -140,7 +140,7 @@ target 'WordPress' do ## Gutenberg (React Native) ## ===================== ## - gutenberg :tag => 'v1.15.0' + gutenberg :commit => '59022eebfe349fecf150ac65fe4db63767181fc8' ## Third party libraries ## ===================== diff --git a/Podfile.lock b/Podfile.lock index f949e90881ac..9cfc2628f63f 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -51,7 +51,7 @@ PODS: - "GoogleToolboxForMac/NSString+URLArguments (2.2.1)" - Gridicons (0.19) - GTMSessionFetcher/Core (1.2.2) - - Gutenberg (1.15.0): + - Gutenberg (1.15.1): - React (= 0.60.0-patched) - React-RCTImage (= 0.60.0-patched) - RNTAztecView @@ -212,7 +212,7 @@ PODS: - RNSVG (9.3.3-gb): - React-Core - React-RCTImage - - RNTAztecView (1.15.0): + - RNTAztecView (1.15.1): - React-Core - WordPress-Aztec-iOS - Sentry (4.4.0): @@ -271,14 +271,14 @@ DEPENDENCIES: - Charts (~> 3.2.2) - CocoaLumberjack (= 3.5.2) - Down (~> 0.6.6) - - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) + - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) - FormatterKit/TimeIntervalFormatter (= 1.8.2) - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.2.0) - Giphy (= 1.1.3) - - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) - Gridicons (~> 0.16) - - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `v1.15.0`) + - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `59022eebfe349fecf150ac65fe4db63767181fc8`) - HockeySDK (= 5.1.4) - MRProgress (= 0.8.3) - Nimble (~> 7.3.1) @@ -288,29 +288,29 @@ DEPENDENCIES: - OHHTTPStubs (= 6.1.0) - OHHTTPStubs/Swift (= 6.1.0) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) - - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) - - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) - - React-DevSupport (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json`) - - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) - - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) - - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json`) - - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) - - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) - - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) - - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) - - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) - - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) - - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) - - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) - - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) - - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) - - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) - - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) - - React-RCTWebSocket (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json`) - - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) - - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) - - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `v1.15.0`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) + - React-DevSupport (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json`) + - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) + - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) + - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) + - React-RCTWebSocket (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json`) + - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `59022eebfe349fecf150ac65fe4db63767181fc8`) - SimulatorStatusMagic - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) @@ -321,7 +321,7 @@ DEPENDENCIES: - WordPressShared (~> 1.8.8) - WordPressUI (~> 1.4) - WPMediaPicker (~> 1.6.0) - - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) + - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) - ZendeskSDK (from `https://github.com/zendesk/zendesk_sdk_ios`, tag `3.0.1-swift5.1-GM`) - ZIPFoundation (~> 0.9.8) @@ -373,64 +373,64 @@ SPEC REPOS: EXTERNAL SOURCES: Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 glog: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json Gutenberg: + :commit: 59022eebfe349fecf150ac65fe4db63767181fc8 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.15.0 React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json React-Core: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json React-cxxreact: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json React-DevSupport: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json React-jsi: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json React-jsiexecutor: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json React-jsinspector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json react-native-keyboard-aware-scroll-view: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json react-native-safe-area: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json react-native-video: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json React-RCTActionSheet: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json React-RCTAnimation: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json React-RCTBlob: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json React-RCTImage: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json React-RCTLinking: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json React-RCTNetwork: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json React-RCTSettings: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json React-RCTText: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json React-RCTVibration: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json React-RCTWebSocket: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json ReactNativeDarkMode: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json RNSVG: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json RNTAztecView: + :commit: 59022eebfe349fecf150ac65fe4db63767181fc8 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.15.0 yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.15.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/59022eebfe349fecf150ac65fe4db63767181fc8/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios :tag: 3.0.1-swift5.1-GM @@ -440,11 +440,11 @@ CHECKOUT OPTIONS: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: + :commit: 59022eebfe349fecf150ac65fe4db63767181fc8 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.15.0 RNTAztecView: + :commit: 59022eebfe349fecf150ac65fe4db63767181fc8 :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: v1.15.0 ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios :tag: 3.0.1-swift5.1-GM @@ -470,7 +470,7 @@ SPEC CHECKSUMS: GoogleToolboxForMac: b3553629623a3b1bff17f555e736cd5a6d95ad55 Gridicons: dc92efbe5fd60111d2e8ea051d84a60cca552abc GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 - Gutenberg: 4dc6b203a26e3f3005536cb2e5b4c8eb72399ce6 + Gutenberg: 3b8866adbfda831ce0f28d5c638eb40c23baed7b HockeySDK: 15afe6bc0a5bfe3a531fd73dbf082095f37dac3b libwebp: 057912d6d0abfb6357d8bb05c0ea470301f5d61e lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062 @@ -504,7 +504,7 @@ SPEC CHECKSUMS: React-RCTWebSocket: 47dfd49bb143d4847fae643816e02646b7bce1b9 ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348 RNSVG: c820516df826221ce4969594bf3e822a464abd51 - RNTAztecView: 4b132fc2672847d8f4636c0e81a8140767b8133e + RNTAztecView: 2c33887480552634a57872a5cc8fe3dee51e3852 Sentry: 26650184fe71eb7476dfd2737acb5ea6cc64b4b1 SimulatorStatusMagic: 28d4a9d1a500ac7cea0b2b5a43c1c6ddb40ba56c Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 @@ -523,6 +523,6 @@ SPEC CHECKSUMS: ZendeskSDK: 07977c9aa708ea64461a1b18b7b3cfec3f496785 ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef -PODFILE CHECKSUM: e5fd22e531f12a6d6e075b137bbda6d2f26441fd +PODFILE CHECKSUM: d8e62b3279287636612e9e5b0be5846ee6b51f24 COCOAPODS: 1.8.4 diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaInserterHelper.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaInserterHelper.swift index dcdd7323be79..da9a8ce68e5d 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaInserterHelper.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaInserterHelper.swift @@ -32,13 +32,13 @@ class GutenbergMediaInserterHelper: NSObject { func insertFromSiteMediaLibrary(media: [Media], callback: @escaping MediaPickerDidPickMediaCallback) { let formattedMedia = media.map { item in - return (item.mediaID?.int32Value, item.remoteURL, item.mediaTypeString) + return MediaInfo(id: item.mediaID?.int32Value, url: item.remoteURL, type: item.mediaTypeString) } callback(formattedMedia) } func insertFromDevice(assets: [PHAsset], callback: @escaping MediaPickerDidPickMediaCallback) { - var mediaCollection: [(Int32?, String?, String?)] = [] + var mediaCollection: [MediaInfo] = [] let group = DispatchGroup() assets.forEach { asset in group.enter() @@ -68,16 +68,16 @@ class GutenbergMediaInserterHelper: NSObject { // Getting a quick thumbnail of the asset to display while the image is being exported and uploaded. PHImageManager.default().requestImage(for: asset, targetSize: asset.pixelSize(), contentMode: .default, options: options) { (image, info) in guard let thumbImage = image, let resizedImage = thumbImage.resizedImage(asset.pixelSize(), interpolationQuality: CGInterpolationQuality.low) else { - callback([(mediaUploadID, nil, media.mediaTypeString)]) + callback([MediaInfo(id: mediaUploadID, url: nil, type: media.mediaTypeString)]) return } let filePath = NSTemporaryDirectory() + "\(mediaUploadID).jpg" let url = URL(fileURLWithPath: filePath) do { try resizedImage.writeJPEGToURL(url) - callback([(mediaUploadID, url.absoluteString, media.mediaTypeString)]) + callback([MediaInfo(id: mediaUploadID, url: url.absoluteString, type: media.mediaTypeString)]) } catch { - callback([(mediaUploadID, nil, media.mediaTypeString)]) + callback([MediaInfo(id: mediaUploadID, url: nil, type: media.mediaTypeString)]) return } } @@ -87,7 +87,7 @@ class GutenbergMediaInserterHelper: NSObject { func insertFromDevice(url: URL, callback: @escaping MediaPickerDidPickMediaCallback) { let media = insert(exportableAsset: url as NSURL, source: .otherApps) let mediaUploadID = media.gutenbergUploadID - callback([(mediaUploadID, url.absoluteString, media.mediaTypeString)]) + callback([MediaInfo(id: mediaUploadID, url: url.absoluteString, type: media.mediaTypeString)]) } func syncUploads() { diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 100b55f2820c..b0caa3f53cb4 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -109,9 +109,9 @@ class GutenbergViewController: UIViewController, PostEditor { } self.mediaInserterHelper.insertFromDevice(assets: phAsset, callback: { media in guard let media = media, - let (id, url, _) = media.first, - let mediaID = id, - let mediaURLString = url, + let mediaInfo = media.first, + let mediaID = mediaInfo.id, + let mediaURLString = mediaInfo.url, let mediaURL = URL(string: mediaURLString) else { return } @@ -421,8 +421,10 @@ extension GutenbergViewController: GutenbergBridgeDelegate { }) } - func gutenbergDidRequestImport(from url: URL, with callback: @escaping MediaPickerDidPickMediaCallback) { - mediaInserterHelper.insertFromDevice(url: url, callback: callback) + func gutenbergDidRequestImport(from url: URL, with callback: @escaping MediaImportCallback) { + mediaInserterHelper.insertFromDevice(url: url, callback: { media in + callback(media?.first) + }) } func gutenbergDidRequestMediaUploadSync() {