diff --git a/CHANGELOG.md b/CHANGELOG.md index 56f4dc2b..3d6f0bfc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,7 @@ 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.21-alpha - unreleased - -This is an alpha version! The changes listed here are not final. +## 1.6.21 - 2023-09-25 ## 1.6.20 - 2023-09-19 diff --git a/composer.json b/composer.json index b6066f35..543a0f2f 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "type": "wordpress-plugin", "license": "GPL-2.0-or-later", "require": { - "automattic/jetpack-mu-wpcom": "^4.11.0-alpha" + "automattic/jetpack-mu-wpcom": "^4.11.0" }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", - "automattic/jetpack-changelogger": "^3.3.10-alpha" + "automattic/jetpack-changelogger": "^3.3.10" }, "autoload": { "classmap": [ @@ -23,6 +23,7 @@ "@composer phpunit" ] }, + "repositories": [], "minimum-stability": "dev", "prefer-stable": true, "extra": { @@ -37,6 +38,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21_alpha" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21" } } diff --git a/composer.lock b/composer.lock index e03ac690..ae2752ad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,18 +4,24 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ecd1fefe295d2ac5fd447cdb35d802c6", + "content-hash": "5aa96e9dc45d52f3d745bf4859153554", "packages": [ { "name": "automattic/jetpack-mu-wpcom", - "version": "4.11.0-alpha.1695666572", + "version": "v4.11.0", + "source": { + "type": "git", + "url": "https://github.com/Automattic/jetpack-mu-wpcom.git", + "reference": "57401050b38cb6a41f830baa2387f0fd0c0107df" + }, "dist": { - "type": "path", - "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "6ae813d70fca2c523f93df4d638c930fdb0ac3bd" + "type": "zip", + "url": "https://api.github.com/repos/Automattic/jetpack-mu-wpcom/zipball/57401050b38cb6a41f830baa2387f0fd0c0107df", + "reference": "57401050b38cb6a41f830baa2387f0fd0c0107df", + "shasum": "" }, "require-dev": { - "automattic/jetpack-changelogger": "^3.3.10-alpha", + "automattic/jetpack-changelogger": "^3.3.10", "automattic/wordbless": "0.4.2", "yoast/phpunit-polyfills": "1.1.0" }, @@ -42,43 +48,31 @@ "src/" ] }, - "scripts": { - "phpunit": [ - "./vendor/phpunit/phpunit/phpunit --colors=always" - ], - "test-php": [ - "@composer phpunit" - ], - "build-production": [ - "echo 'Add your build step to composer.json, please!'" - ], - "build-development": [ - "echo 'Add your build step to composer.json, please!'" - ], - "post-install-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ], - "post-update-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], "description": "Enhances your site with features powered by WordPress.com", - "transport-options": { - "relative": false - } + "support": { + "source": "https://github.com/Automattic/jetpack-mu-wpcom/tree/v4.11.0" + }, + "time": "2023-09-25T19:07:18+00:00" } ], "packages-dev": [ { "name": "automattic/jetpack-changelogger", - "version": "3.3.10-alpha.1695663293", + "version": "v3.3.10", + "source": { + "type": "git", + "url": "https://github.com/Automattic/jetpack-changelogger.git", + "reference": "8bdb83cf46a73e7d05efc381a16d86af87af011c" + }, "dist": { - "type": "path", - "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "cacc0acc6045270285449cf8f5abb9eaaa9f9f80" + "type": "zip", + "url": "https://api.github.com/repos/Automattic/jetpack-changelogger/zipball/8bdb83cf46a73e7d05efc381a16d86af87af011c", + "reference": "8bdb83cf46a73e7d05efc381a16d86af87af011c", + "shasum": "" }, "require": { "php": ">=5.6", @@ -109,30 +103,11 @@ }, "autoload": { "psr-4": { - "Automattic\\Jetpack\\Changelogger\\": "src", - "Automattic\\Jetpack\\Changelog\\": "lib" + "Automattic\\Jetpack\\Changelog\\": "lib", + "Automattic\\Jetpack\\Changelogger\\": "src" } }, - "autoload-dev": { - "psr-4": { - "Automattic\\Jetpack\\Changelogger\\Tests\\": "tests/php/includes/src", - "Automattic\\Jetpack\\Changelog\\Tests\\": "tests/php/includes/lib" - } - }, - "scripts": { - "phpunit": [ - "./vendor/phpunit/phpunit/phpunit --colors=always" - ], - "test-php": [ - "@composer phpunit" - ], - "post-install-cmd": [ - "[ -e vendor/bin/changelogger ] || { cd vendor/bin && ln -s ../../bin/changelogger; }" - ], - "post-update-cmd": [ - "[ -e vendor/bin/changelogger ] || { cd vendor/bin && ln -s ../../bin/changelogger; }" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], @@ -143,9 +118,10 @@ "dev", "keepachangelog" ], - "transport-options": { - "relative": false - } + "support": { + "source": "https://github.com/Automattic/jetpack-changelogger/tree/v3.3.10" + }, + "time": "2023-09-25T19:06:31+00:00" }, { "name": "doctrine/instantiator", @@ -2766,10 +2742,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "automattic/jetpack-mu-wpcom": 20, - "automattic/jetpack-changelogger": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": [], diff --git a/mu-wpcom-plugin.php b/mu-wpcom-plugin.php index ae8dbb98..672a6686 100644 --- 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.21-alpha + * Version: 1.6.21 * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/package.json b/package.json index 93b728bd..3df7855e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "1.6.21-alpha", + "version": "1.6.21", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": { diff --git a/vendor/autoload.php b/vendor/autoload.php index 4a526e21..fb17e834 100644 --- 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_21_alpha::getLoader(); +return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21::getLoader(); diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md index 89cb0aa4..c111b86c 100644 --- a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md +++ b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md @@ -5,19 +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). -## [4.11.0-alpha] - unreleased - -This is an alpha version! The changes listed here are not final. - +## [4.11.0] - 2023-09-25 ### Added -- Adds 100 Year Plan features, including the ability to set a legacy contact and enable locked mode. -- Adds a feature to include helpers for the First Posts stream. In particular, an option is being added to the sync list. -- Add the Calypso path for the setup_link_in_bio task -- Support Videopress tasks on the Customer Home Launchpad +- Adds 100 Year Plan features, including the ability to set a legacy contact and enable locked mode. [#33081] +- Adds a feature to include helpers for the First Posts stream. In particular, an option is being added to the sync list. [#33253] +- Add the Calypso path for the setup_link_in_bio task. [#32905] +- Support Videopress tasks on the Customer Home Launchpad. [#33153] ### Fixed -- Added check for jetpack sync option to only run on Atomic -- Locked Mode: Now applies cap filter in REST API requests as well +- Locked Mode: Now applies cap filter in REST API requests as well. [#33246] ## [4.10.0] - 2023-09-19 ### Added @@ -373,7 +369,7 @@ This is an alpha version! The changes listed here are not final. - Testing initial package release. -[4.11.0-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.10.0...v4.11.0-alpha +[4.11.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.10.0...v4.11.0 [4.10.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.9.0...v4.10.0 [4.9.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.8.0...v4.9.0 [4.8.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v4.7.0...v4.8.0 diff --git a/vendor/automattic/jetpack-mu-wpcom/composer.json b/vendor/automattic/jetpack-mu-wpcom/composer.json index 5da8cdc7..39b58db7 100644 --- a/vendor/automattic/jetpack-mu-wpcom/composer.json +++ b/vendor/automattic/jetpack-mu-wpcom/composer.json @@ -6,7 +6,7 @@ "require": {}, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", - "automattic/jetpack-changelogger": "^3.3.10-alpha", + "automattic/jetpack-changelogger": "^3.3.10", "automattic/wordbless": "0.4.2" }, "suggest": { 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 index b03e5d43..ff143ee4 100644 --- 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.11.0-alpha'; + const PACKAGE_VERSION = '4.11.0'; const PKG_DIR = __DIR__ . '/../'; /** diff --git a/vendor/automattic/jetpack-mu-wpcom/src/features/first-posts-stream/first-posts-stream-helpers.php b/vendor/automattic/jetpack-mu-wpcom/src/features/first-posts-stream/first-posts-stream-helpers.php index 7b136fd5..e5131598 100644 --- a/vendor/automattic/jetpack-mu-wpcom/src/features/first-posts-stream/first-posts-stream-helpers.php +++ b/vendor/automattic/jetpack-mu-wpcom/src/features/first-posts-stream/first-posts-stream-helpers.php @@ -12,15 +12,6 @@ * @param array $allowed_options The allowed options. */ function register_first_posts_stream_options_sync( $allowed_options ) { - // We are not either in Simple or Atomic. - if ( ! class_exists( 'Automattic\Jetpack\Status\Host' ) ) { - return $allowed_options; - } - - if ( ! ( new Automattic\Jetpack\Status\Host() )->is_woa_site() ) { - return $allowed_options; - } - if ( ! is_array( $allowed_options ) ) { return $allowed_options; } diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index f4be67b1..fd696604 100644 --- 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_21_alpha +class ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21 { 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_21_alpha', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21_alpha', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21_alpha::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 4f95ca0d..edfede98 100644 --- 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_21_alpha +class ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21 { public static $classMap = array ( 'Automattic\\Jetpack\\Jetpack_Mu_Wpcom' => __DIR__ . '/..' . '/automattic/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php', @@ -18,7 +18,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_21_alpha::$classMap; + $loader->classMap = ComposerStaticInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ1_6_21::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index b167b96c..23a33ddd 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,21 +2,28 @@ "packages": [ { "name": "automattic/jetpack-mu-wpcom", - "version": "4.11.0-alpha.1695666572", - "version_normalized": "4.11.0.0-alpha1695666572", + "version": "v4.11.0", + "version_normalized": "4.11.0.0", + "source": { + "type": "git", + "url": "https://github.com/Automattic/jetpack-mu-wpcom.git", + "reference": "57401050b38cb6a41f830baa2387f0fd0c0107df" + }, "dist": { - "type": "path", - "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "6ae813d70fca2c523f93df4d638c930fdb0ac3bd" + "type": "zip", + "url": "https://api.github.com/repos/Automattic/jetpack-mu-wpcom/zipball/57401050b38cb6a41f830baa2387f0fd0c0107df", + "reference": "57401050b38cb6a41f830baa2387f0fd0c0107df", + "shasum": "" }, "require-dev": { - "automattic/jetpack-changelogger": "^3.3.10-alpha", + "automattic/jetpack-changelogger": "^3.3.10", "automattic/wordbless": "0.4.2", "yoast/phpunit-polyfills": "1.1.0" }, "suggest": { "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package." }, + "time": "2023-09-25T19:07:18+00:00", "type": "jetpack-library", "extra": { "mirror-repo": "Automattic/jetpack-mu-wpcom", @@ -38,32 +45,13 @@ "src/" ] }, - "scripts": { - "phpunit": [ - "./vendor/phpunit/phpunit/phpunit --colors=always" - ], - "test-php": [ - "@composer phpunit" - ], - "build-production": [ - "echo 'Add your build step to composer.json, please!'" - ], - "build-development": [ - "echo 'Add your build step to composer.json, please!'" - ], - "post-install-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ], - "post-update-cmd": [ - "WorDBless\\Composer\\InstallDropin::copy" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], "description": "Enhances your site with features powered by WordPress.com", - "transport-options": { - "relative": false + "support": { + "source": "https://github.com/Automattic/jetpack-mu-wpcom/tree/v4.11.0" }, "install-path": "../automattic/jetpack-mu-wpcom" } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ea79f71d..01284ff1 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -11,9 +11,9 @@ ), 'versions' => array( 'automattic/jetpack-mu-wpcom' => array( - 'pretty_version' => '4.11.0-alpha.1695666572', - 'version' => '4.11.0.0-alpha1695666572', - 'reference' => '6ae813d70fca2c523f93df4d638c930fdb0ac3bd', + 'pretty_version' => 'v4.11.0', + 'version' => '4.11.0.0', + 'reference' => '57401050b38cb6a41f830baa2387f0fd0c0107df', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(),