diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index 012178e20ac5..0871836bc31c 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - tag: v1.111.0 + tag: v1.112.0-alpha3 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index df5509caf529..17c8a7c3e3ad 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,7 +26,7 @@ PODS: - FSInteractiveMap (0.1.0) - Gifu (3.3.1) - Gridicons (1.2.0) - - Gutenberg (1.111.0) + - Gutenberg (1.111.1) - JTAppleCalendar (8.0.5) - Kanvas (1.4.9): - CropViewController @@ -58,7 +58,7 @@ PODS: - Sodium (0.9.1) - Starscream (3.0.6) - SVProgressHUD (2.2.5) - - SwiftLint (0.54.0) + - SwiftLint (0.53.0) - UIDeviceIdentifier (2.3.0) - WordPress-Aztec-iOS (1.19.9) - WordPress-Editor-iOS (1.19.9): @@ -106,7 +106,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.111.0.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0-alpha3.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -130,7 +130,6 @@ SPEC REPOS: https://github.com/wordpress-mobile/cocoapods-specs.git: - WordPressAuthenticator - WordPressKit - - WordPressShared trunk: - Alamofire - AlamofireImage @@ -159,6 +158,7 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS + - WordPressShared - WordPressUI - wpxmlrpc - ZendeskCommonUISDK @@ -175,7 +175,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.111.0.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.112.0-alpha3.podspec CHECKOUT OPTIONS: FSInteractiveMap: @@ -194,7 +194,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: c222e0a909a508ecb1cc130278c17c0193cb64fc + Gutenberg: 69f7bd049f723c9574bbbc7019ecaf8bb6bb477f JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae @@ -208,13 +208,13 @@ SPEC CHECKSUMS: Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6 - SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211 + SwiftLint: 5ce4d6a8ff83f1b5fd5ad5dbf30965d35af65e44 UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17 WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb WordPress-Editor-iOS: bda9f7f942212589b890329a0cb22547311749ef WordPressAuthenticator: e3c18f1b63222742a565fea3faf1a55a144ce8c4 WordPressKit: 57712035a44595cf49b0c9f0ad5b8b899a8cbe6a - WordPressShared: cad7777b283d3ce2752f283df587342a581cd49b + WordPressShared: f99faa127509b666d2f8b931989a900e2fd9d10d WordPressUI: a491454affda3b0fb812812e637dc5e8f8f6bd06 wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd ZendeskCommonUISDK: 5f0a83f412e07ae23701f18c412fe783b3249ef5 diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift index 6f3854294701..6b6192b66b43 100644 --- a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift +++ b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergViewController.swift @@ -1230,7 +1230,6 @@ extension GutenbergViewController: GutenbergBridgeDataSource { .unsupportedBlockEditor: false, .canEnableUnsupportedBlockEditor: false, .isAudioBlockMediaUploadEnabled: !isFreeWPCom, - .mediaFilesCollectionBlock: false, .reusableBlock: false, .shouldUseFastImage: !post.blog.isPrivate(), .facebookEmbed: false, @@ -1252,7 +1251,6 @@ extension GutenbergViewController: GutenbergBridgeDataSource { .unsupportedBlockEditor: isUnsupportedBlockEditorEnabled, .canEnableUnsupportedBlockEditor: post.blog.jetpack?.isConnected ?? false, .isAudioBlockMediaUploadEnabled: !isFreeWPCom, - .mediaFilesCollectionBlock: post.blog.supports(.stories) && !UIDevice.isPad(), // Only enable reusable block in WP.com sites until the issue // (https://github.com/wordpress-mobile/gutenberg-mobile/issues/3457) in self-hosted sites is fixed .reusableBlock: isWPComSite,