Merge pull request #2588 from wordpress-mobile/release/1.36.0

Release 1.36.0
wordpress-mobile · Sep 3, 2020 · 3c1d9ee · 3c1d9ee
2 parents e4825b2 + 3622635
commit 3c1d9ee
Show file tree

Hide file tree

Showing 36 changed files with 3,100 additions and 3,073 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1 @@
+module.exports = require( '@wordpress/prettier-config' );
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,3 +1,8 @@
+1.36.0
+------
+* [**] [Android] New block: Pullquote
+* [**] Block settings now immediately reflect changes from menu sliders.
+
 1.35.0
 ------
 * [***] Fixed empty text fields on RTL layout. Now they are selectable and placeholders are visible.

diff --git a/bin/release_automation.sh b/bin/release_automation.sh
@@ -28,10 +28,10 @@ else
     ohai "Confirmed that Aztec Libraries are set to release versions. Proceeding..."
 fi
 
-## Check current branch is develop, main, or release/* branch
+## Check current branch is develop, trunk, or release/* branch
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-if [[ ! "$CURRENT_BRANCH" =~ "^develop$|^main$|^release/.*" ]]; then
-    echo "Releases should generally only be based on 'develop', 'main', or an earlier release branch."
+if [[ ! "$CURRENT_BRANCH" =~ "^develop$|^trunk$|^release/.*" ]]; then
+    echo "Releases should generally only be based on 'develop', 'trunk', or an earlier release branch."
     echo "You are currently on the '$CURRENT_BRANCH' branch."
     confirm_to_proceed "Are you sure you want to create a release branch from the '$CURRENT_BRANCH' branch?"
 fi
@@ -142,7 +142,7 @@ BASE_REMOTE=$(get_remote_name 'wordpress-mobile/gutenberg-mobile')
 execute "git" "push" "-u" "$BASE_REMOTE" "HEAD"
 
 # Create Draft GB-Mobile Release PR in GitHub
-GB_MOBILE_PR_URL=$(execute "gh" "pr" "create" "--title" "Release $VERSION_NUMBER" "--body" "$PR_BODY" "--base" "main" "--label" "release-process" "--draft")
+GB_MOBILE_PR_URL=$(execute "gh" "pr" "create" "--title" "Release $VERSION_NUMBER" "--body" "$PR_BODY" "--base" "trunk" "--label" "release-process" "--draft")
 
 #####
 # Gutenberg PR

diff --git a/bundle/android/App.js b/bundle/android/App.js
diff --git a/bundle/android/App.js.map b/bundle/android/App.js.map
diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_latestposts_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_latestposts_block.json
@@ -74,6 +74,10 @@
 		"featuredImageSizeHeight": {
 			"type": "number",
 			"default": null
+		},
+		"addLinkToFeaturedImage": {
+			"type": "boolean",
+			"default": false
 		}
 	},
 	"supports": {

diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_list_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_list_block.json
@@ -11,10 +11,7 @@
 			"source": "html",
 			"selector": "ol,ul",
 			"multiline": "li",
-			"__unstableMultilineWrapperTags": [
-				"ol",
-				"ul"
-			],
+			"__unstableMultilineWrapperTags": [ "ol", "ul" ],
 			"default": ""
 		},
 		"type": {
@@ -30,6 +27,9 @@
 	"supports": {
 		"anchor": true,
 		"className": false,
+		"__experimentalColor": {
+			"gradients": true
+		},
 		"__unstablePasteTextInline": true,
 		"lightBlockWrapper": true
 	}

diff --git a/bundle/android/raw/gutenberg_packages_blocklibrary_src_paragraph_block.json b/bundle/android/raw/gutenberg_packages_blocklibrary_src_paragraph_block.json
@@ -35,11 +35,6 @@
 		},
 		"__experimentalFontSize": true,
 		"__experimentalLineHeight": true,
-		"__experimentalFeatures": {
-			"typography": {
-				"dropCap": true
-			}
-		},
 		"__experimentalSelector": "p",
 		"__unstablePasteTextInline": true
 	}

diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ar.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ar.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_it.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_it.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ja.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ja.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ko.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ko.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_nb.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_nb.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ro.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_ro.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_sq.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_sq.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_sv.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_sv.json
diff --git a/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_tr.json b/bundle/android/raw/gutenberg_packages_reactnativeeditor_i18ncache_data_tr.json
diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml
@@ -30,6 +30,7 @@
     <string name="gutenberg_native_add_video" tools:ignore="UnusedResources">ADD VIDEO</string>
     <string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
+    <string name="gutenberg_native_angle" tools:ignore="UnusedResources">Angle</string>
     <string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
     <!-- translators: displayed right after the block is copied. -->
     <string name="gutenberg_native_block_copied" tools:ignore="UnusedResources">Block copied</string>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require( '@wordpress/prettier-config' );