Merge branch 'trunk' into task/17087-reaction_moderation_bar_spacing

Author: ScoutHarris

.buildkite/cache-builder.yml

@@ -7,7 +7,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/bash-cache#v1.5.0
+    - automattic/bash-cache#2.2.0
     - automattic/git-s3-cache#v1.1.0:
         bucket: "a8c-repo-mirrors"
         repo: "wordpress-mobile/wordpress-ios/"

.buildkite/pipeline.yml

@@ -2,7 +2,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/bash-cache#v1.6.0
+    - automattic/bash-cache#2.2.0
     - automattic/git-s3-cache#v1.1.0:
         bucket: "a8c-repo-mirrors"
         repo: "wordpress-mobile/wordpress-ios/"

.buildkite/release-builds.yml

@@ -4,7 +4,7 @@
 common_params:
   # Common plugin settings to use with the `plugins` key.
   - &common_plugins
-    - automattic/bash-cache#v1.5.0
+    - automattic/bash-cache#2.2.0
     - automattic/git-s3-cache#v1.1.0:
         bucket: "a8c-repo-mirrors"
         repo: "wordpress-mobile/wordpress-ios/"

Podfile

@@ -169,7 +169,7 @@ abstract_target 'Apps' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :tag => 'v1.74.0-alpha1'
+    gutenberg :tag => 'v1.74.0'
 
     ## Third party libraries
     ## =====================

Podfile.lock

@@ -3,6 +3,9 @@
 * [*] a11y: VoiceOver has been improved on the Menus view and now announces changes to ordering. [#18155]
 * [*] Notifications list: remove comment Trash swipe action. [#18349]
 * [*] Reader: Fixed a bug that caused cut off content in reader web view [#16106]
+* [**] Block Editor: Quote block: Adds support for V2 behind a feature flag [https://github.com/WordPress/gutenberg/pull/40133]
+* [**] Block Editor: Update "add block" button's style in default editor view [https://github.com/WordPress/gutenberg/pull/39726]
+* [*] Block Editor: Remove banner error notification on upload failure [https://github.com/WordPress/gutenberg/pull/39694]
 * [*] My Site: display site name in My Site screen nav title [#18373]
 
 19.6

RELEASE-NOTES.txt

@@ -20,23 +20,38 @@ class BloggingPromptsFeatureDescriptionView: UIView, NibLoadable {
 private extension BloggingPromptsFeatureDescriptionView {
 
     func configureView() {
-        promptCardView.layer.borderWidth = Style.borderWidth
-        promptCardView.layer.cornerRadius = Style.cardCornerRadius
-        promptCardView.layer.borderColor = Style.borderColor
+        configurePromptCard()
+        configureDescription()
+        configureNote()
+    }
 
+    func configurePromptCard() {
         let promptCard = DashboardPromptsCardCell()
         promptCard.configureForExampleDisplay()
         promptCard.translatesAutoresizingMaskIntoConstraints = false
+
+        promptCard.layer.borderWidth = Style.borderWidth
+        promptCard.layer.cornerRadius = Style.cardCornerRadius
+        promptCard.layer.borderColor = Style.cardBorderColor
+
+        promptCard.layer.shadowOffset = Style.cardShadowOffset
+        promptCard.layer.shadowOpacity = Style.cardShadowOpacity
+        promptCard.layer.shadowRadius = Style.cardShadowRadius
+
         promptCardView.addSubview(promptCard)
         promptCardView.pinSubviewToSafeArea(promptCard)
+    }
 
+    func configureDescription() {
         descriptionLabel.font = Style.labelFont
         descriptionLabel.textColor = Style.textColor
         descriptionLabel.text = Strings.featureDescription
+    }
 
+    func configureNote() {
         noteTextView.layer.borderWidth = Style.borderWidth
         noteTextView.layer.cornerRadius = Style.noteCornerRadius
-        noteTextView.layer.borderColor = Style.borderColor
+        noteTextView.layer.borderColor = Style.noteBorderColor
         noteTextView.textContainerInset = Style.noteInsets
         configureNoteText()
     }
@@ -69,8 +84,12 @@ private extension BloggingPromptsFeatureDescriptionView {
         static let textColor: UIColor = .textSubtle
         static let noteInsets = UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
         static let noteCornerRadius: CGFloat = 6
-        static let cardCornerRadius: CGFloat = 16
+        static let cardCornerRadius: CGFloat = 10
+        static let cardShadowRadius: CGFloat = 14
+        static let cardShadowOpacity: Float = 0.1
+        static let cardShadowOffset = CGSize(width: 0, height: 10.0)
+        static let cardBorderColor = UIColor(red: 0.882, green: 0.886, blue: 0.886, alpha: 1).cgColor
         static let borderWidth: CGFloat = 1
-        static let borderColor = UIColor.textQuaternary.cgColor
+        static let noteBorderColor = UIColor.textQuaternary.cgColor
     }
 }