Skip to content

Commit

Permalink
Backport mu-wpcom-plugin 2.5.4, jetpack 13.7-beta, wpcomsh 5.2.1 Chan…
Browse files Browse the repository at this point in the history
…ges (#38723)

* Changelog and readme.txt edits.

* Amend readme.txt

* Init new cycle

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10254032361

Upstream-Ref: Automattic/jetpack@5654d68
  • Loading branch information
zinigor authored and matticbot committed Aug 5, 2024
1 parent a903f17 commit 6c3c6a9
Show file tree
Hide file tree
Showing 16 changed files with 121 additions and 127 deletions.
7 changes: 2 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ 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).

## 2.5.4-alpha - unreleased

This is an alpha version! The changes listed here are not final.

## 2.5.4 - 2024-08-05
### Changed
- Fixup versions
- Fixup versions [#38612]

## 2.5.3 - 2024-07-30
### Changed
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "wordpress-plugin",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-mu-wpcom": "^5.53.1-alpha"
"automattic/jetpack-mu-wpcom": "^5.53.1"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down Expand Up @@ -37,6 +37,6 @@
]
},
"config": {
"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_4_alpha"
"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_4"
}
}
64 changes: 32 additions & 32 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mu-wpcom-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Plugin Name: WordPress.com Features
* Description: Test plugin for the jetpack-mu-wpcom package
* Version: 2.5.4-alpha
* Version: 2.5.4
* Author: Automattic
* License: GPLv2 or later
* Text Domain: jetpack-mu-wpcom-plugin
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-mu-wpcom-plugin",
"version": "2.5.4-alpha",
"version": "2.5.4",
"description": "Test plugin for the jetpack-mu-wpcom package",
"homepage": "https://jetpack.com",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_4_alpha::getLoader();
return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_4::getLoader();
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-blaze/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"automattic/jetpack-plans": "^0.4.7",
"automattic/jetpack-redirect": "^2.0.2",
"automattic/jetpack-status": "^3.3.2",
"automattic/jetpack-sync": "^3.4.1-alpha"
"automattic/jetpack-sync": "^3.4.1"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down
8 changes: 4 additions & 4 deletions vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ 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).

## [5.53.1-alpha] - unreleased

This is an alpha version! The changes listed here are not final.
## [5.53.1] - 2024-08-05
### Changed
- Internal updates.

## [5.53.0] - 2024-08-05
### Added
Expand Down Expand Up @@ -1101,7 +1101,7 @@ This is an alpha version! The changes listed here are not final.

- Testing initial package release.

[5.53.1-alpha]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.53.0...v5.53.1-alpha
[5.53.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.53.0...v5.53.1
[5.53.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.52.1...v5.53.0
[5.52.1]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.52.0...v5.52.1
[5.52.0]: https://github.com/Automattic/jetpack-mu-wpcom/compare/v5.51.0...v5.52.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Jetpack_Mu_Wpcom main class.
*/
class Jetpack_Mu_Wpcom {
const PACKAGE_VERSION = '5.53.1-alpha';
const PACKAGE_VERSION = '5.53.1';
const PKG_DIR = __DIR__ . '/../';
const BASE_DIR = __DIR__ . '/';
const BASE_FILE = __FILE__;
Expand Down
9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ 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).

## [3.4.1-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [3.4.1] - 2024-08-05
### Fixed
- Jetpack Sync: Take order type into account when performing HPOS Checksums
- Jetpack Sync: Take order type into account when performing HPOS Checksums [#38688]

## [3.4.0] - 2024-07-29
### Added
Expand Down Expand Up @@ -1226,7 +1223,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[3.4.1-alpha]: https://github.com/Automattic/jetpack-sync/compare/v3.4.0...v3.4.1-alpha
[3.4.1]: https://github.com/Automattic/jetpack-sync/compare/v3.4.0...v3.4.1
[3.4.0]: https://github.com/Automattic/jetpack-sync/compare/v3.3.1...v3.4.0
[3.3.1]: https://github.com/Automattic/jetpack-sync/compare/v3.3.0...v3.3.1
[3.3.0]: https://github.com/Automattic/jetpack-sync/compare/v3.2.1...v3.3.0
Expand Down
Loading

0 comments on commit 6c3c6a9

Please sign in to comment.