diff --git a/Podfile b/Podfile index 689fb859d5f6..713811d0ca8c 100644 --- a/Podfile +++ b/Podfile @@ -147,7 +147,7 @@ target 'WordPress' do ## Gutenberg (React Native) ## ===================== ## - gutenberg :tag => '1.29.0' + gutenberg :commit => 'a3a155d0053c75985960ae7ac8ecfaa2e3732efa' ## Third party libraries ## ===================== diff --git a/Podfile.lock b/Podfile.lock index 0ccf9258be09..1956f521be15 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -433,15 +433,15 @@ DEPENDENCIES: - Charts (~> 3.2.2) - CocoaLumberjack (= 3.5.2) - Down (~> 0.6.6) - - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json`) - - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json`) - - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json`) + - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json`) + - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json`) + - Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/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/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json`) - Gridicons (~> 1.0.1) - - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `1.29.0`) + - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `a3a155d0053c75985960ae7ac8ecfaa2e3732efa`) - JTAppleCalendar (~> 8.0.2) - MediaEditor (~> 1.1.0) - MRProgress (= 0.8.3) @@ -451,34 +451,34 @@ DEPENDENCIES: - OCMock (= 3.4.3) - OHHTTPStubs (= 6.1.0) - OHHTTPStubs/Swift (= 6.1.0) - - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json`) - - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json`) + - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json`) + - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json`) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) - - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) - - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json`) - - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) - - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) - - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) - - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.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/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) - - react-native-linear-gradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json`) - - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) - - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json`) - - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) - - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) - - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) - - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) - - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) - - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) - - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) - - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) - - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) - - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) - - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json`) - - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) - - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) - - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `1.29.0`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json`) + - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/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/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) + - react-native-linear-gradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json`) + - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json`) + - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json`) + - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json`) + - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json`) + - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, commit `a3a155d0053c75985960ae7ac8ecfaa2e3732efa`) - SimulatorStatusMagic - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) @@ -489,7 +489,7 @@ DEPENDENCIES: - WordPressShared (~> 1.8.16) - WordPressUI (~> 1.7.0) - WPMediaPicker (~> 1.7.0) - - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`) + - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`) - ZendeskSupportSDK (= 5.0.0) - ZIPFoundation (~> 0.9.8) @@ -550,87 +550,87 @@ SPEC REPOS: EXTERNAL SOURCES: FBLazyVector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/FBLazyVector.podspec.json FBReactNativeSpec: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/FBReactNativeSpec.podspec.json Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/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/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/glog.podspec.json Gutenberg: + :commit: a3a155d0053c75985960ae7ac8ecfaa2e3732efa :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: 1.29.0 RCTRequired: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/RCTRequired.podspec.json RCTTypeSafety: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/RCTTypeSafety.podspec.json React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React.podspec.json React-Core: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-Core.podspec.json React-CoreModules: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-CoreModules.podspec.json React-cxxreact: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-cxxreact.podspec.json React-jsi: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-jsi.podspec.json React-jsiexecutor: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-jsiexecutor.podspec.json React-jsinspector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-jsinspector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/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/1.29.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/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json react-native-linear-gradient: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-linear-gradient.podspec.json react-native-safe-area: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-safe-area.podspec.json react-native-slider: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-slider.podspec.json react-native-video: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json React-RCTActionSheet: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTActionSheet.podspec.json React-RCTAnimation: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTAnimation.podspec.json React-RCTBlob: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTBlob.podspec.json React-RCTImage: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTImage.podspec.json React-RCTLinking: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTLinking.podspec.json React-RCTNetwork: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTNetwork.podspec.json React-RCTSettings: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTSettings.podspec.json React-RCTText: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTText.podspec.json React-RCTVibration: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/React-RCTVibration.podspec.json ReactCommon: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/ReactCommon.podspec.json ReactNativeDarkMode: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/ReactNativeDarkMode.podspec.json RNSVG: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/RNSVG.podspec.json RNTAztecView: + :commit: a3a155d0053c75985960ae7ac8ecfaa2e3732efa :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: 1.29.0 Yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1.29.0/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a3a155d0053c75985960ae7ac8ecfaa2e3732efa/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json CHECKOUT OPTIONS: FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: + :commit: a3a155d0053c75985960ae7ac8ecfaa2e3732efa :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: 1.29.0 RNTAztecView: + :commit: a3a155d0053c75985960ae7ac8ecfaa2e3732efa :git: http://github.com/wordpress-mobile/gutenberg-mobile/ - :tag: 1.29.0 SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 @@ -720,6 +720,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -PODFILE CHECKSUM: 0c57a5614b06c5b4e84e13975b8068d9c61ec350 +PODFILE CHECKSUM: 2bc3eb3ac69e02d017a5a63f1c82bd0f779a26d7 COCOAPODS: 1.8.4 diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d9d9e45086c9..7808d613b955 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,7 @@ 15.1 ----- - +* [**] Block editor: Adds support for theme colors and gradients. + 15.0 ----- * [**] Block editor: Fix media upload progress when there's no connection. @@ -38,7 +39,7 @@ * Support the superscript and subscript HTML formatting on the Block Editor and Classic Editor. * [***] You can now draw on images to annotate them using the Edit image feature in the post editor. * [*] Fixed a bug on the editors where changing a featured image didn't trigger that the post/page changed. - + 14.8.1 ----- * Fix adding and removing of featured images to posts. @@ -59,7 +60,7 @@ * [internal] the "send magic link" screen has navigation changes that can cause regressions. See https://git.io/Jfqiz for testing details. * Updated UI for Login and Signup epilogues. * Fixes delayed split view resizing while rotating your device. - + 14.7 ----- * Classic Editor: Fixed action sheet position for additional Media sources picker on iPad @@ -78,9 +79,9 @@ * Updated site details screen title to My Site, to avoid duplicating the title of the current site which is displayed in the screen's header area. * You can now schedule your post, add tags or change the visibility before hitting "Publish Now" — and you don't have to go to the Post Settings for this! -* Login Epilogue: fixed issue where account information never stopped loading for some self-hosted sites. -* Updated site details screen title to My Site, to avoid duplicating the title of the current site which is displayed in the screen's header area. - +* Login Epilogue: fixed issue where account information never stopped loading for some self-hosted sites. +* Updated site details screen title to My Site, to avoid duplicating the title of the current site which is displayed in the screen's header area. + 14.6 ----- * [internal] the login flow with 2-factor authentication enabled has code changes that can cause regressions. See https://git.io/Jvdil for testing details. diff --git a/WordPress/Classes/Models/EditorTheme.swift b/WordPress/Classes/Models/EditorTheme.swift new file mode 100644 index 000000000000..f2761cb89f47 --- /dev/null +++ b/WordPress/Classes/Models/EditorTheme.swift @@ -0,0 +1,46 @@ +import Foundation +import Gutenberg + +struct EditorTheme: Codable, Equatable { + static func == (lhs: EditorTheme, rhs: EditorTheme) -> Bool { + return lhs.description == rhs.description + } + + enum CodingKeys: String, CodingKey { + case themeSupport = "theme_supports" + case version + case stylesheet + } + + let themeSupport: EditorThemeSupport? + let version: String? + let stylesheet: String? + + var description: String { + return "\(stylesheet ?? "")-\(version ?? "")" + } + + init(from decoder: Decoder) throws { + let map = try decoder.container(keyedBy: CodingKeys.self) + self.themeSupport = try? map.decode(EditorThemeSupport.self, forKey: .themeSupport) + self.version = try? map.decode(String.self, forKey: .version) + self.stylesheet = try? map.decode(String.self, forKey: .stylesheet) + } +} + +struct EditorThemeSupport: Codable, GutenbergEditorTheme { + + enum CodingKeys: String, CodingKey { + case colors = "editor-color-palette" + case gradients = "editor-gradient-presets" + } + + let colors: [[String: String]]? + let gradients: [[String: String]]? + + init(from decoder: Decoder) throws { + let map = try decoder.container(keyedBy: CodingKeys.self) + self.colors = try? map.decode([[String: String]].self, forKey: .colors) + self.gradients = try? map.decode([[String: String]].self, forKey: .gradients) + } +} diff --git a/WordPress/Classes/Stores/EditorThemeStore.swift b/WordPress/Classes/Stores/EditorThemeStore.swift new file mode 100644 index 000000000000..0ea01b9f422b --- /dev/null +++ b/WordPress/Classes/Stores/EditorThemeStore.swift @@ -0,0 +1,126 @@ +import WordPressFlux + +struct EditorThemeQuery { + let blog: Blog +} + +enum EditorThemeStoreState { + typealias StoredThemes = [String: EditorTheme] + case empty + case loaded(StoredThemes) + + static func key(forBlog blog: Blog) -> String? { + return blog.hostname as String? + } + + func editorTheme(forBlog blog: Blog) -> EditorTheme? { + guard let themeKey = EditorThemeStoreState.key(forBlog: blog) else { + return nil + } + + switch self { + case .loaded(let themes): + return themes[themeKey] + default: + return nil + } + } + + func storedThemes() -> StoredThemes { + switch self { + case .loaded(let themes): + return themes + default: + return [:] + } + } +} + +extension EditorThemeStoreState: Codable { + + enum Key: CodingKey { + case rawValue + case associatedValue + } + + enum CodingError: Error { + case unknownValue + } + + init(from decoder: Decoder) throws { + let container = try decoder.container(keyedBy: Key.self) + let rawValue = try container.decode(Int.self, forKey: .rawValue) + switch rawValue { + case 0: + self = .empty + case 1: + let themes = try container.decode(StoredThemes.self, forKey: .associatedValue) + self = .loaded(themes) + default: + throw CodingError.unknownValue + } + } + + func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: Key.self) + switch self { + case .empty: + try container.encode(0, forKey: .rawValue) + case .loaded(let themes): + try container.encode(1, forKey: .rawValue) + try container.encode(themes, forKey: .associatedValue) + } + } +} + +class EditorThemeStore: QueryStore { + + private enum ErrorCode: Int { + case processingError + } + + init(dispatcher: ActionDispatcher = .global) { + super.init(initialState: .empty, dispatcher: dispatcher) + } + + override func queriesChanged() { + + activeQueries.forEach { (query) in + fetchTheme(for: query.blog) + } + } + + override func logError(_ error: String) { + DDLogError("Error loading active theme: \(error)") + } +} + +private extension EditorThemeStore { + + func fetchTheme(for blog: Blog) { + let requestPath = "/wp/v2/themes?status=active" + GutenbergNetworkRequest(path: requestPath, blog: blog).request { [weak self] result in + switch result { + case .success(let response): + self?.processResponse(response, for: blog) + case .failure(let error): + DDLogError("Error loading active theme: \(error)") + } + } + } + + func processResponse(_ response: Any, for blog: Blog) { + guard + let responseData = try? JSONSerialization.data(withJSONObject: response, options: []), + let themeKey = EditorThemeStoreState.key(forBlog: blog), + let themeSupports = try? JSONDecoder().decode([EditorTheme].self, from: responseData), + let newTheme = themeSupports.first + else { return } + + var existingThemes = state.storedThemes() + if newTheme != existingThemes[themeKey] { + existingThemes[themeKey] = newTheme + state = .loaded(existingThemes) + } + } +} diff --git a/WordPress/Classes/Stores/StoreContainer.swift b/WordPress/Classes/Stores/StoreContainer.swift index b757de361bd4..3a1df427db4a 100644 --- a/WordPress/Classes/Stores/StoreContainer.swift +++ b/WordPress/Classes/Stores/StoreContainer.swift @@ -20,4 +20,5 @@ class StoreContainer { let statsInsights = StatsInsightsStore() let statsPeriod = StatsPeriodStore() let jetpackInstall = JetpackInstallStore() + let editorTheme = EditorThemeStore() } diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 8c5acc0ef400..96ef6d025284 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -2,6 +2,7 @@ import UIKit import WPMediaPicker import Gutenberg import Aztec +import WordPressFlux class GutenbergViewController: UIViewController, PostEditor { @@ -231,6 +232,9 @@ class GutenbergViewController: UIViewController, PostEditor { return gutenbergSettings.shouldPresentInformativeDialog(for: post.blog) }() + private var themeSupportQuery: Receipt? = nil + private var themeSupportReceipt: Receipt? = nil + // MARK: - Initializers required init( post: AbstractPost, @@ -277,6 +281,7 @@ class GutenbergViewController: UIViewController, PostEditor { gutenberg.delegate = self showInformativeDialogIfNecessary() + fetchEditorTheme() } override func viewWillAppear(_ animated: Bool) { @@ -606,6 +611,7 @@ extension GutenbergViewController: GutenbergBridgeDelegate { } focusTitleIfNeeded() mediaInserterHelper.refreshMediaStatus() + refreshEditorTheme() } } @@ -878,3 +884,30 @@ private extension GutenbergViewController { static let retryAllFailedUploadsActionTitle = NSLocalizedString("Retry all", comment: "User action to retry all failed media uploads.") } } + +// Editor Theme Support +extension GutenbergViewController { + + // GutenbergBridgeDataSource + func gutenbergEditorTheme() -> GutenbergEditorTheme? { + return StoreContainer.shared.editorTheme.state.editorTheme(forBlog: post.blog)?.themeSupport + } + + private func fetchEditorTheme() { + let themeSupportStore = StoreContainer.shared.editorTheme + themeSupportQuery = themeSupportStore.query(EditorThemeQuery(blog: post.blog)) + themeSupportReceipt = themeSupportStore.onStateChange { [weak self] (_, state) in + DispatchQueue.main.async { + if let strongSelf = self, let themeSupport = state.editorTheme(forBlog: strongSelf.post.blog)?.themeSupport { + strongSelf.gutenberg.updateTheme(themeSupport) + } + } + } + } + + private func refreshEditorTheme() { + if let themeSupport = StoreContainer.shared.editorTheme.state.editorTheme(forBlog: post.blog)?.themeSupport { + gutenberg.updateTheme(themeSupport) + } + } +} diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 59daa843f621..d5906b57290b 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -577,10 +577,12 @@ 43FB3F411EBD215C00FC8A62 /* LoginEpilogueBlogCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FB3F401EBD215C00FC8A62 /* LoginEpilogueBlogCell.swift */; }; 43FB3F471EC10F1E00FC8A62 /* LoginEpilogueTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FB3F461EC10F1E00FC8A62 /* LoginEpilogueTableViewController.swift */; }; 43FF64EF20DAA0840060A69A /* GravatarUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FF64EE20DAA0840060A69A /* GravatarUploader.swift */; }; + 4629E41D243D21400002E15C /* EditorThemeStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4629E41C243D21400002E15C /* EditorThemeStore.swift */; }; 4629E4212440C5B20002E15C /* GutenbergCoverUploadProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4629E4202440C5B20002E15C /* GutenbergCoverUploadProcessor.swift */; }; 4629E4232440C8160002E15C /* GutenbergCoverUploadProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4629E4222440C8160002E15C /* GutenbergCoverUploadProcessorTests.swift */; }; 462F4E0A18369F0B0028D2F8 /* BlogDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 462F4E0718369F0B0028D2F8 /* BlogDetailsViewController.m */; }; 46638DF6244904A3006E8439 /* GutenbergBlockProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46638DF5244904A3006E8439 /* GutenbergBlockProcessor.swift */; }; + 46963F5924649542000D356D /* EditorTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46963F5824649542000D356D /* EditorTheme.swift */; }; 4B2DD0F29CD6AC353C056D41 /* Pods_WordPressUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DCE7542239FBC709B90EA85 /* Pods_WordPressUITests.framework */; }; 4C8A715EBCE7E73AEE216293 /* Pods_WordPressShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F47DB4A8EC2E6844E213A3FA /* Pods_WordPressShareExtension.framework */; }; 4D520D4F22972BC9002F5924 /* acknowledgements.html in Resources */ = {isa = PBXBuildFile; fileRef = 4D520D4E22972BC9002F5924 /* acknowledgements.html */; }; @@ -2957,11 +2959,13 @@ 43FB3F401EBD215C00FC8A62 /* LoginEpilogueBlogCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginEpilogueBlogCell.swift; sourceTree = ""; }; 43FB3F461EC10F1E00FC8A62 /* LoginEpilogueTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginEpilogueTableViewController.swift; sourceTree = ""; }; 43FF64EE20DAA0840060A69A /* GravatarUploader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GravatarUploader.swift; sourceTree = ""; }; + 4629E41C243D21400002E15C /* EditorThemeStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorThemeStore.swift; sourceTree = ""; }; 4629E4202440C5B20002E15C /* GutenbergCoverUploadProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergCoverUploadProcessor.swift; sourceTree = ""; }; 4629E4222440C8160002E15C /* GutenbergCoverUploadProcessorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergCoverUploadProcessorTests.swift; sourceTree = ""; }; 462F4E0618369F0B0028D2F8 /* BlogDetailsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlogDetailsViewController.h; sourceTree = ""; }; 462F4E0718369F0B0028D2F8 /* BlogDetailsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = BlogDetailsViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 46638DF5244904A3006E8439 /* GutenbergBlockProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GutenbergBlockProcessor.swift; sourceTree = ""; }; + 46963F5824649542000D356D /* EditorTheme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTheme.swift; sourceTree = ""; }; 46F84612185A8B7E009D0DA5 /* PostContentProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostContentProvider.h; sourceTree = ""; }; 48690E659987FD4472EEDE5F /* Pods-WordPressNotificationContentExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressNotificationContentExtension.release.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressNotificationContentExtension/Pods-WordPressNotificationContentExtension.release.xcconfig"; sourceTree = ""; }; 4D520D4E22972BC9002F5924 /* acknowledgements.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = acknowledgements.html; path = "../Pods/Target Support Files/Pods-WordPress/acknowledgements.html"; sourceTree = ""; }; @@ -5707,6 +5711,7 @@ 2F706A870DFB229B00B43086 /* Models */ = { isa = PBXGroup; children = ( + 46963F5724649509000D356D /* Gutenberg */, 40A71C5F220E1941002E3D25 /* Stats */, 9A38DC63218899E4006A409B /* Revisions */, D8CB56212181A93F00554EAE /* Site Creation */, @@ -6387,6 +6392,14 @@ name = "Resources-iPad"; sourceTree = ""; }; + 46963F5724649509000D356D /* Gutenberg */ = { + isa = PBXGroup; + children = ( + 46963F5824649542000D356D /* EditorTheme.swift */, + ); + name = Gutenberg; + sourceTree = ""; + }; 5703A4C722C0214C0028A343 /* Style */ = { isa = PBXGroup; children = ( @@ -10082,6 +10095,7 @@ 9A2D0B24225CB97F009E585F /* JetpackInstallStore.swift */, 9A4E271C22EF33F5001F6A6B /* AccountSettingsStore.swift */, 9A09F914230C3E9700F42AB7 /* StoreFetchingStatus.swift */, + 4629E41C243D21400002E15C /* EditorThemeStore.swift */, ); path = Stores; sourceTree = ""; @@ -12018,6 +12032,7 @@ E1222B671F878E4700D23173 /* WebViewControllerFactory.swift in Sources */, E1D86E691B2B414300DD2192 /* WordPress-32-33.xcmappingmodel in Sources */, 9A2B28E8219046ED00458F2A /* ShowRevisionsListManger.swift in Sources */, + 46963F5924649542000D356D /* EditorTheme.swift in Sources */, 985ED0E423C6950600B8D06A /* WidgetStyles.swift in Sources */, 57CCB3812358ED07003ECD0C /* WordPress-91-92.xcmappingmodel in Sources */, 5D2B30B91B7411C700DA15F3 /* ReaderCardDiscoverAttributionView.swift in Sources */, @@ -12224,6 +12239,7 @@ E6805D311DCD399600168E4F /* WPRichTextImage.swift in Sources */, 7E4123C120F4097B00DF8486 /* FormattableContentRange.swift in Sources */, 08D978581CD2AF7D0054F19A /* MenuItemSourceHeaderView.m in Sources */, + 4629E41D243D21400002E15C /* EditorThemeStore.swift in Sources */, 3FF1A853242D5FCB00373F5D /* WPTabBarController+ReaderTabNavigation.swift in Sources */, BE1071FC1BC75E7400906AFF /* WPStyleGuide+Blog.swift in Sources */, B56695B01D411EEB007E342F /* KeyboardDismissHelper.swift in Sources */,