Backport Jetpack 12.5-beta Changes (#32606)

sdixon194 · matticbot · commit df627c0a6098 · 2023-08-21T21:15:50.000Z
Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/5931365022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.6.14-alpha - unreleased
+## 1.6.15-alpha - unreleased
 
 This is an alpha version! The changes listed here are not final.
 
 ### Changed
 - Updated package dependencies.
 
+## 1.6.14 - 2023-08-21
+
 ## 1.6.13 - 2023-08-15
 ### Changed
 - Internal updates.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
 	"type": "wordpress-plugin",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-mu-wpcom": "^4.5.0-alpha"
+		"automattic/jetpack-mu-wpcom": "^4.5.1-alpha"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",
@@ -37,6 +37,6 @@
 		]
 	},
 	"config": {
-		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha"
+		"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha"
 	}
 }
diff --git a/composer.lock b/composer.lock
diff --git a/mu-wpcom-plugin.php b/mu-wpcom-plugin.php
@@ -3,7 +3,7 @@
  *
  * Plugin Name: WordPress.com Features
  * Description: Test plugin for the jetpack-mu-wpcom package
- * Version: 1.6.14-alpha
+ * Version: 1.6.15-alpha
  * Author: Automattic
  * License: GPLv2 or later
  * Text Domain: jetpack-mu-wpcom-plugin
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-mu-wpcom-plugin",
-	"version": "1.6.14-alpha",
+	"version": "1.6.15-alpha",
 	"description": "Test plugin for the jetpack-mu-wpcom package",
 	"homepage": "https://jetpack.com",
 	"bugs": {
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha::getLoader();
+return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha::getLoader();
diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md
@@ -5,21 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [4.5.0-alpha] - unreleased
+## [4.5.1-alpha] - unreleased
 
 This is an alpha version! The changes listed here are not final.
 
+### Changed
+- Updated package dependencies.
+
+## [4.5.0] - 2023-08-21
 ### Added
-- Added new 'skipped' option to launchpad checklist
+- Added new 'skipped' option to launchpad checklist [#32500]
 
 ### Changed
-- Remove the initial slash to match the pattern used throughout the project
-- Updated package dependencies.
+- Remove the initial slash to match the pattern used throughout the project [#32365]
 
 ### Fixed
-- Add calypso path for set_up_payments task.
-- Fix completion logic for welcome message on newsletters task.
-- Reuse completion method to make it easier to add tracking and check for list completion.
+- Add calypso path for set_up_payments task. [#32526]
+- Fix completion logic for welcome message on newsletters task. [#32466]
+- Reuse completion method to make it easier to add tracking and check for list completion. [#31471]
 
 ## [4.4.1] - 2023-08-15
 ### Changed
@@ -318,7 +321,8 @@ This is an alpha version! The changes listed here are not final.
 
 - Testing initial package release.
 
-[4.5.0-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.4.1...v4.5.0-alpha
+[4.5.1-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.5.0...v4.5.1-alpha
+[4.5.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.4.1...v4.5.0
 [4.4.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.4.0...v4.4.1
 [4.4.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.3.1...v4.4.0
 [4.3.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.3.0...v4.3.1
diff --git a/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/vendor/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php
@@ -14,7 +14,7 @@
  */
 class Jetpack_Mu_Wpcom {
 
-	const PACKAGE_VERSION = '4.5.0-alpha';
+	const PACKAGE_VERSION = '4.5.1-alpha';
 	const PKG_DIR         = __DIR__ . '/../';
 
 	/**
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha
+class ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha
+class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha
 {
     public static $classMap = array (
         'Automattic\\Jetpack\\Jetpack_Mu_Wpcom' => __DIR__ . '/..' . '/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php',
@@ -16,7 +16,7 @@ class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_plugin
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha::$classMap;
+            $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -2,12 +2,12 @@
     "packages": [
         {
             "name": "automattic/jetpack-mu-wpcom",
-            "version": "4.5.0-alpha.1692641735",
-            "version_normalized": "4.5.0.0-alpha1692641735",
+            "version": "4.5.1-alpha.1692651329",
+            "version_normalized": "4.5.1.0-alpha1692651329",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom",
-                "reference": "156981e4dd062e6df479a4e90dd22143e32a61b2"
+                "reference": "69980f911de72c0d12cf36c2f280a6dc085111e2"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8-alpha",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         'automattic/jetpack-mu-wpcom' => array(
-            'pretty_version' => '4.5.0-alpha.1692641735',
-            'version' => '4.5.0.0-alpha1692641735',
-            'reference' => '156981e4dd062e6df479a4e90dd22143e32a61b2',
+            'pretty_version' => '4.5.1-alpha.1692651329',
+            'version' => '4.5.1.0-alpha1692651329',
+            'reference' => '69980f911de72c0d12cf36c2f280a6dc085111e2',
             'type' => 'jetpack-library',
             'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom',
             'aliases' => array(),

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"type": "wordpress-plugin",`
`5`	`5`	`"license": "GPL-2.0-or-later",`
`6`	`6`	`"require": {`
`7`		`- "automattic/jetpack-mu-wpcom": "^4.5.0-alpha"`
	`7`	`+ "automattic/jetpack-mu-wpcom": "^4.5.1-alpha"`
`8`	`8`	`},`
`9`	`9`	`"require-dev": {`
`10`	`10`	`"yoast/phpunit-polyfills": "1.1.0",`
`@@ -37,6 +37,6 @@`
`37`	`37`	`]`
`38`	`38`	`},`
`39`	`39`	`"config": {`
`40`		`- "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha"`
	`40`	`+ "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha"`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Plugin Name: WordPress.com Features`
`5`	`5`	`* Description: Test plugin for the jetpack-mu-wpcom package`
`6`		`- * Version: 1.6.14-alpha`
	`6`	`+ * Version: 1.6.15-alpha`
`7`	`7`	`* Author: Automattic`
`8`	`8`	`* License: GPLv2 or later`
`9`	`9`	`* Text Domain: jetpack-mu-wpcom-plugin`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"private": true,`
`3`	`3`	`"name": "@automattic/jetpack-mu-wpcom-plugin",`
`4`		`- "version": "1.6.14-alpha",`
	`4`	`+ "version": "1.6.15-alpha",`
`5`	`5`	`"description": "Test plugin for the jetpack-mu-wpcom package",`
`6`	`6`	`"homepage": "https://jetpack.com",`
`7`	`7`	`"bugs": {`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@`
`22`	`22`
`23`	`23`	`require_once __DIR__ . '/composer/autoload_real.php';`
`24`	`24`
`25`		`-return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha::getLoader();`
	`25`	`+return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha::getLoader();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Composer\Autoload;`
`6`	`6`
`7`		`-class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha`
	`7`	`+class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha`
`8`	`8`	`{`
`9`	`9`	`public static $classMap = array (`
`10`	`10`	`'Automattic\\Jetpack\\Jetpack_Mu_Wpcom' => __DIR__ . '/..' . '/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php',`
`@@ -16,7 +16,7 @@ class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_plugin`
`16`	`16`	`public static function getInitializer(ClassLoader $loader)`
`17`	`17`	`{`
`18`	`18`	`return \Closure::bind(function () use ($loader) {`
`19`		`- $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_14_alpha::$classMap;`
	`19`	`+ $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_15_alpha::$classMap;`
`20`	`20`
`21`	`21`	`}, null, ClassLoader::class);`
`22`	`22`	`}`