Skip to content

Commit

Permalink
Backport mu-wpcom-plugin 2.5.2, jetpack 13.7-a.7, wpcomsh 5.1.0 Chang…
Browse files Browse the repository at this point in the history
…es (#38595)

* Changelog and readme.txt edits.

* Init new cycle

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

Upstream-Ref: Automattic/jetpack@7f32df3
  • Loading branch information
zinigor authored and matticbot committed Jul 30, 2024
1 parent 4eff2e9 commit 1fb2d70
Show file tree
Hide file tree
Showing 20 changed files with 141 additions and 143 deletions.
6 changes: 3 additions & 3 deletions 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).

## 2.5.2-alpha - unreleased

This is an alpha version! The changes listed here are not final.
## 2.5.2 - 2024-07-29
### Changed
- Internal updates.

## 2.5.1 - 2024-07-25
### 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.51.0-alpha"
"automattic/jetpack-mu-wpcom": "^5.52.0-alpha"
},
"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_2_alpha"
"autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_2"
}
}
70 changes: 35 additions & 35 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.2-alpha
* Version: 2.5.2
* 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.2-alpha",
"version": "2.5.2",
"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_2_alpha::getLoader();
return ComposerAutoloaderInitd9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_2::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.0-alpha"
"automattic/jetpack-sync": "^3.4.0"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down
9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-masterbar/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).

## [0.6.0-alpha] - unreleased

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

## [0.6.0] - 2024-07-29
### Changed
- Remove Browse sites from sidebar as it's on WordPress logo in masterbar
- Remove Browse sites from sidebar as it's on WordPress logo in masterbar [#38547]

## [0.5.0] - 2024-07-22
### Added
Expand Down Expand Up @@ -83,7 +80,7 @@ This is an alpha version! The changes listed here are not final.
- Updated package dependencies. [#37669]
- Updated package dependencies. [#37706]

[0.6.0-alpha]: https://github.com/Automattic/jetpack-masterbar/compare/v0.5.0...v0.6.0-alpha
[0.6.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.5.0...v0.6.0
[0.5.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/Automattic/jetpack-masterbar/compare/v0.3.1...v0.4.0
[0.3.1]: https://github.com/Automattic/jetpack-masterbar/compare/v0.3.0...v0.3.1
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-masterbar/src/class-main.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
class Main {

const PACKAGE_VERSION = '0.6.0-alpha';
const PACKAGE_VERSION = '0.6.0';

/**
* Initializer.
Expand Down
Loading

0 comments on commit 1fb2d70

Please sign in to comment.