diff --git a/Podfile b/Podfile index e0882c001d83..6b6dadb7fb46 100644 --- a/Podfile +++ b/Podfile @@ -29,7 +29,7 @@ def aztec ## pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => '81e1e1bb1cb209004d66bba75338595cc9aab147' ## pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :tag => '1.5.0.beta.1' ## pod 'WordPress-Editor-iOS', :path => '../AztecEditor-iOS' - pod 'WordPress-Editor-iOS', '~> 1.11.0' + pod 'WordPress-Editor-iOS', '~> 1.12.0' end def wordpress_ui @@ -140,7 +140,7 @@ target 'WordPress' do ## Gutenberg (React Native) ## ===================== ## - gutenberg :commit => 'bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b' + gutenberg :tag => 'v1.17.0' ## Third party libraries ## ===================== diff --git a/Podfile.lock b/Podfile.lock index b22c03f9f4a1..2801d2c2885c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -46,7 +46,7 @@ PODS: - "GoogleToolboxForMac/NSString+URLArguments (2.2.2)" - Gridicons (0.19) - GTMSessionFetcher/Core (1.3.0) - - Gutenberg (1.16.0): + - Gutenberg (1.17.0): - React (= 0.60.0-patched) - React-RCTImage (= 0.60.0-patched) - RNTAztecView @@ -198,19 +198,19 @@ PODS: - RNSVG (9.3.3-gb): - React-Core - React-RCTImage - - RNTAztecView (1.16.0): + - RNTAztecView (1.17.0): - React-Core - WordPress-Aztec-iOS - - Sentry (4.4.0): - - Sentry/Core (= 4.4.0) - - Sentry/Core (4.4.0) + - Sentry (4.4.1): + - Sentry/Core (= 4.4.1) + - Sentry/Core (4.4.1) - SimulatorStatusMagic (2.4.1) - Starscream (3.0.6) - SVProgressHUD (2.2.5) - UIDeviceIdentifier (1.1.4) - - WordPress-Aztec-iOS (1.11.0) - - WordPress-Editor-iOS (1.11.0): - - WordPress-Aztec-iOS (= 1.11.0) + - WordPress-Aztec-iOS (1.12.0) + - WordPress-Editor-iOS (1.12.0): + - WordPress-Aztec-iOS (= 1.12.0) - WordPressAuthenticator (1.10.2): - 1PasswordExtension (= 1.8.5) - Alamofire (= 4.7.3) @@ -257,13 +257,13 @@ DEPENDENCIES: - Charts (~> 3.2.2) - CocoaLumberjack (= 3.5.2) - Down (~> 0.6.6) - - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) + - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/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) - - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) - Gridicons (~> 0.16) - - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b`) + - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `v1.17.0`) - HockeySDK (= 5.1.4) - JTAppleCalendar (~> 8.0.2) - MRProgress (= 0.8.3) @@ -274,40 +274,40 @@ DEPENDENCIES: - OHHTTPStubs (= 6.1.0) - OHHTTPStubs/Swift (= 6.1.0) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) - - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) - - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) - - React-DevSupport (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json`) - - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) - - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) - - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/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/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/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/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/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/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) - - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) - - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) - - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) - - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) - - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) - - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) - - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) - - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) - - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) - - React-RCTWebSocket (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json`) - - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) - - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) - - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) + - React-DevSupport (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.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.17.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.17.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.17.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.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) + - React-RCTWebSocket (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json`) + - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `v1.17.0`) - SimulatorStatusMagic - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - - WordPress-Editor-iOS (~> 1.11.0) + - WordPress-Editor-iOS (~> 1.12.0) - WordPressAuthenticator (~> 1.10.2) - WordPressKit (~> 4.5.3-beta.3) - WordPressMocks (~> 0.0.6) - WordPressShared (~> 1.8.8) - WordPressUI (~> 1.5.0) - WPMediaPicker (~> 1.6.0) - - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) + - yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json`) - ZendeskSDK (from `https://github.com/zendesk/zendesk_sdk_ios`, tag `3.0.2`) - ZIPFoundation (~> 0.9.8) @@ -356,64 +356,64 @@ SPEC REPOS: EXTERNAL SOURCES: Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/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/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json Gutenberg: - :commit: bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b :git: http://github.com/wordpress-mobile/gutenberg-mobile/ + :tag: v1.17.0 React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json React-Core: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json React-cxxreact: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json React-DevSupport: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-DevSupport.podspec.json React-jsi: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json React-jsiexecutor: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json React-jsinspector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/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/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/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/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/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/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json React-RCTActionSheet: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json React-RCTAnimation: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json React-RCTBlob: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json React-RCTImage: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json React-RCTLinking: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json React-RCTNetwork: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json React-RCTSettings: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json React-RCTText: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json React-RCTVibration: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json React-RCTWebSocket: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTWebSocket.podspec.json ReactNativeDarkMode: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json RNSVG: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json RNTAztecView: - :commit: bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b :git: http://github.com/wordpress-mobile/gutenberg-mobile/ + :tag: v1.17.0 yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.17.0/react-native-gutenberg-bridge/third-party-podspecs/yoga.podspec.json ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios :tag: 3.0.2 @@ -423,11 +423,11 @@ CHECKOUT OPTIONS: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :commit: bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b :git: http://github.com/wordpress-mobile/gutenberg-mobile/ + :tag: v1.17.0 RNTAztecView: - :commit: bdbe882b1071cbfdd67fc3a5314e5d1de37cb04b :git: http://github.com/wordpress-mobile/gutenberg-mobile/ + :tag: v1.17.0 ZendeskSDK: :git: https://github.com/zendesk/zendesk_sdk_ios :tag: 3.0.2 @@ -451,7 +451,7 @@ SPEC CHECKSUMS: GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3 Gridicons: dc92efbe5fd60111d2e8ea051d84a60cca552abc GTMSessionFetcher: 43b8b64263023d4f32caa0b40f4c8bfa3c5f36d8 - Gutenberg: b4648d8e71389a171b54b8594e15cd960b937a17 + Gutenberg: f25a39370ce4d3ed8841b6426127ce66b0be6c15 HockeySDK: 15afe6bc0a5bfe3a531fd73dbf082095f37dac3b JTAppleCalendar: bb3dd3752e2bcc85cb798ab763fbdd6e142715fc lottie-ios: 3fef45d3fabe63e3c7c2eb603dd64ddfffc73062 @@ -484,14 +484,14 @@ SPEC CHECKSUMS: React-RCTWebSocket: 47dfd49bb143d4847fae643816e02646b7bce1b9 ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348 RNSVG: c820516df826221ce4969594bf3e822a464abd51 - RNTAztecView: 131acf030dc862b6b71a05e3355a0ed7715dbcdc - Sentry: 26650184fe71eb7476dfd2737acb5ea6cc64b4b1 + RNTAztecView: bd09494ce0d55366488aabdaf73bd939459702db + Sentry: 5d312a04e369154aeac616214f4dfc3cbcc8b296 SimulatorStatusMagic: 28d4a9d1a500ac7cea0b2b5a43c1c6ddb40ba56c Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c - WordPress-Aztec-iOS: 050b34d4c3adfb7c60363849049b13d60683b348 - WordPress-Editor-iOS: 304098424f1051cb271546c99f906aac296b1b81 + WordPress-Aztec-iOS: 316a3897753731847c3ed3337dbd4bb1d664b92b + WordPress-Editor-iOS: c070068608056079ac7d2e020204016a7159cbb8 WordPressAuthenticator: af8a2b733b8a33d2ad04cdd30f5410bfe772f439 WordPressKit: 839cf499576b6ebaf5793a466c3ced622b6fe44e WordPressMocks: 5913bd04586a360212e07a8ccbcb36068d4425a3 @@ -503,6 +503,6 @@ SPEC CHECKSUMS: ZendeskSDK: 35b16898fae049f6ebffba96793f209b03a41495 ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef -PODFILE CHECKSUM: 23d28718b172f521491bcdfe18430b7d9be6ee4c +PODFILE CHECKSUM: f50d5afa60ac34b0fb2d831153c3e21c8b2821ec COCOAPODS: 1.8.4 diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 5574570f1f1f..354fbba3a506 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -2,9 +2,14 @@ ----- * Updated the mobile apps blog address to a non-retired blog. * Block editor: Added option to insert images from "Free Photo Library". +* Block editor: Fix issue where the keyboard would not capitalize sentences correctly on some cases +* Block editor: Add alignment to paragraph blocks * Fixed a bug that made comment moderation fail on the first attempt for self-hosted sites. +* Block editor: Added support for the preformatted block. * Stats Today widget: updated design and enabled expanding. +* Block editor: Added option to insert images from "Free Photo Library" and "Other Apps". + 13.6 ----- * Fixed a bug that was not submiting posts for review diff --git a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift index 4706d15014be..2db8c45eb00a 100644 --- a/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift +++ b/WordPress/Classes/ViewRelated/Aztec/ViewControllers/AztecPostViewController.swift @@ -153,8 +153,9 @@ class AztecPostViewController: UIViewController, PostEditor { textView.textAttachmentDelegate = self textView.backgroundColor = Colors.aztecBackground - textView.blockquoteBackgroundColor = UIColor(light: textView.blockquoteBackgroundColor, dark: .neutral(.shade5)) + textView.blockquoteBackgroundColor = .neutral(.shade5) textView.blockquoteBorderColor = .listIcon + textView.preBackgroundColor = .neutral(.shade5) textView.linkTextAttributes = linkAttributes diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 25fe33467f8c..bcbeb9fc3dc4 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -19,6 +19,9 @@ class GutenbergViewController: UIViewController, PostEditor { private lazy var stockPhotos: GutenbergStockPhotos = { return GutenbergStockPhotos(gutenberg: gutenberg, mediaInserter: mediaInserterHelper) }() + private lazy var filesAppMediaPicker: GutenbergFilesAppMediaSource = { + return GutenbergFilesAppMediaSource(gutenberg: gutenberg, mediaInserter: mediaInserterHelper) + }() // MARK: - Aztec @@ -360,6 +363,8 @@ extension GutenbergViewController: GutenbergBridgeDelegate { gutenbergDidRequestMediaFromCameraPicker(filter: flags, with: callback) case .stockPhotos: stockPhotos.presentPicker(origin: self, post: post, multipleSelection: allowMultipleSelection, callback: callback) + case .filesApp: + filesAppMediaPicker.presentPicker(origin: self, filters: filter, multipleSelection: allowMultipleSelection, callback: callback) default: break } } @@ -563,10 +568,10 @@ extension GutenbergViewController: GutenbergBridgeDataSource { } func gutenbergMediaSources() -> [Gutenberg.MediaSource] { - if post.blog.supports(.stockPhotos) { - return [.stockPhotos] - } - return [] + return [ + post.blog.supports(.stockPhotos) ? .stockPhotos : nil, + .filesApp, + ].compactMap { $0 } } } @@ -665,6 +670,7 @@ extension GutenbergViewController: PostEditorNavigationBarManagerDelegate { extension Gutenberg.MediaSource { static let stockPhotos = Gutenberg.MediaSource(id: "wpios-stock-photo-library", label: .freePhotosLibrary, types: [.image]) + static let filesApp = Gutenberg.MediaSource(id: "wpios-files-app", label: .files, types: [.image, .video, .audio, .other]) } private extension GutenbergViewController { diff --git a/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift new file mode 100644 index 000000000000..4977f0982c2a --- /dev/null +++ b/WordPress/Classes/ViewRelated/Gutenberg/Utils/GutenbergFilesAppMediaSource.swift @@ -0,0 +1,70 @@ +import Gutenberg +import MobileCoreServices + +class GutenbergFilesAppMediaSource: NSObject { + private var mediaPickerCallback: MediaPickerDidPickMediaCallback? + private let mediaInserter: GutenbergMediaInserterHelper + private unowned var gutenberg: Gutenberg + + init(gutenberg: Gutenberg, mediaInserter: GutenbergMediaInserterHelper) { + self.mediaInserter = mediaInserter + self.gutenberg = gutenberg + } + + func presentPicker(origin: UIViewController, filters: [Gutenberg.MediaType], multipleSelection: Bool, callback: @escaping MediaPickerDidPickMediaCallback) { + let uttypeFilters = filters.compactMap { $0.typeIdentifier } + mediaPickerCallback = callback + let docPicker = UIDocumentPickerViewController(documentTypes: uttypeFilters, in: .import) + docPicker.delegate = self + docPicker.allowsMultipleSelection = multipleSelection + WPStyleGuide.configureDocumentPickerNavBarAppearance() + origin.present(docPicker, animated: true) + } +} + +extension GutenbergFilesAppMediaSource: UIDocumentPickerDelegate { + func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) { + defer { + mediaPickerCallback = nil + } + if let documentURL = urls.first { + insertOnBlock(with: documentURL) + } else { + mediaPickerCallback?(nil) + } + } + + func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) { + WPStyleGuide.configureNavigationAppearance() + mediaPickerCallback?(nil) + mediaPickerCallback = nil + } + + /// Adds the given image object to the requesting Image Block + /// - Parameter asset: Stock Media object to add. + func insertOnBlock(with url: URL) { + WPStyleGuide.configureNavigationAppearance() + guard let callback = mediaPickerCallback else { + return assertionFailure("Image picked without callback") + } + + let media = self.mediaInserter.insert(exportableAsset: url as NSURL, source: .otherApps) + let mediaUploadID = media.gutenbergUploadID + callback([MediaInfo(id: mediaUploadID, url: url.absoluteString, type: media.mediaTypeString)]) + } +} + +extension Gutenberg.MediaType { + var typeIdentifier: String? { + switch self { + case .image: + return String(kUTTypeImage) + case .video: + return String(kUTTypeMovie) + case .audio: + return String(kUTTypeAudio) + case .other: + return nil + } + } +} diff --git a/WordPress/Resources/en.lproj/Localizable.strings b/WordPress/Resources/en.lproj/Localizable.strings index 9e9cda1ddf4d..b9116719af35 100644 Binary files a/WordPress/Resources/en.lproj/Localizable.strings and b/WordPress/Resources/en.lproj/Localizable.strings differ diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index a5adf75a475a..925ba91b48ed 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -887,6 +887,7 @@ 7E3E7A6620E44F200075D159 /* HeaderContentGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E3E7A6520E44F200075D159 /* HeaderContentGroup.swift */; }; 7E3E9B702177C9DC00FD5797 /* GutenbergViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E3E9B6F2177C9DC00FD5797 /* GutenbergViewController.swift */; }; 7E407121237163B8003627FA /* GutenbergStockPhotos.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E407120237163B8003627FA /* GutenbergStockPhotos.swift */; }; + 7E40713A2372AD54003627FA /* GutenbergFilesAppMediaSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E4071392372AD54003627FA /* GutenbergFilesAppMediaSource.swift */; }; 7E4123B920F4097B00DF8486 /* FormattableContentFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E4123AC20F4097900DF8486 /* FormattableContentFactory.swift */; }; 7E4123BA20F4097B00DF8486 /* FormattableContentGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E4123AD20F4097900DF8486 /* FormattableContentGroup.swift */; }; 7E4123BC20F4097B00DF8486 /* DefaultFormattableContentAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E4123AF20F4097A00DF8486 /* DefaultFormattableContentAction.swift */; }; @@ -3041,6 +3042,7 @@ 7E3E7A6520E44F200075D159 /* HeaderContentGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderContentGroup.swift; sourceTree = ""; }; 7E3E9B6F2177C9DC00FD5797 /* GutenbergViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergViewController.swift; sourceTree = ""; }; 7E407120237163B8003627FA /* GutenbergStockPhotos.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergStockPhotos.swift; sourceTree = ""; }; + 7E4071392372AD54003627FA /* GutenbergFilesAppMediaSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergFilesAppMediaSource.swift; sourceTree = ""; }; 7E4123AC20F4097900DF8486 /* FormattableContentFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormattableContentFactory.swift; sourceTree = ""; }; 7E4123AD20F4097900DF8486 /* FormattableContentGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FormattableContentGroup.swift; sourceTree = ""; }; 7E4123AF20F4097A00DF8486 /* DefaultFormattableContentAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultFormattableContentAction.swift; sourceTree = ""; }; @@ -6451,6 +6453,7 @@ isa = PBXGroup; children = ( 7E407120237163B8003627FA /* GutenbergStockPhotos.swift */, + 7E4071392372AD54003627FA /* GutenbergFilesAppMediaSource.swift */, ); path = Utils; sourceTree = ""; @@ -10923,6 +10926,7 @@ 08216FD51CDBF96000304BA7 /* MenuItemTypeViewController.m in Sources */, B526DC291B1E47FC002A8C5F /* WPStyleGuide+WebView.m in Sources */, 82FC61271FA8ADAD00A1757E /* WPStyleGuide+Activity.swift in Sources */, + 7E40713A2372AD54003627FA /* GutenbergFilesAppMediaSource.swift in Sources */, B532D4EC199D4357006E4DF6 /* NoteBlockTextTableViewCell.swift in Sources */, B52F8CD81B43260C00D36025 /* NotificationSettingStreamsViewController.swift in Sources */, E1AB5A071E0BF17500574B4E /* Array.swift in Sources */, diff --git a/WordPress/WordPressShareExtension/ShareExtensionEditorViewController.swift b/WordPress/WordPressShareExtension/ShareExtensionEditorViewController.swift index d93c74da6046..aab3bb10fa61 100644 --- a/WordPress/WordPressShareExtension/ShareExtensionEditorViewController.swift +++ b/WordPress/WordPressShareExtension/ShareExtensionEditorViewController.swift @@ -58,8 +58,9 @@ class ShareExtensionEditorViewController: ShareExtensionAbstractViewController { textView.backgroundColor = ShareColors.aztecBackground textView.textColor = .text textView.tintColor = ShareColors.aztecCursorColor - textView.blockquoteBackgroundColor = UIColor(light: textView.blockquoteBackgroundColor, dark: .neutral(.shade5)) + textView.blockquoteBackgroundColor = .neutral(.shade5) textView.blockquoteBorderColor = .listIcon + textView.preBackgroundColor = .neutral(.shade5) textView.linkTextAttributes = linkAttributes textView.textAlignment = .natural