Skip to content

Commit

Permalink
Backport chaanges for mu-wpcom-plugin 1.7.1 and jejtpack 12.8-a.1 (#3…
Browse files Browse the repository at this point in the history
…3619)

* Changelog edits.

* Set version to 12.8-a.2

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6537945473
  • Loading branch information
ice9js authored and matticbot committed Oct 16, 2023
1 parent b36319b commit 63a4204
Show file tree
Hide file tree
Showing 16 changed files with 205 additions and 217 deletions.
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"automattic/jetpack-composer-plugin": "^1.1.14",
"automattic/jetpack-config": "^1.15.4",
"automattic/jetpack-connection": "^1.58.1",
"automattic/jetpack-identity-crisis": "^0.10.7-alpha",
"automattic/jetpack-my-jetpack": "^3.8.2-alpha",
"automattic/jetpack-search": "^0.39.2-alpha",
"automattic/jetpack-identity-crisis": "^0.10.7",
"automattic/jetpack-my-jetpack": "^3.8.2",
"automattic/jetpack-search": "^0.39.2",
"automattic/jetpack-stats": "^0.6.5",
"automattic/jetpack-status": "^1.18.5",
"automattic/jetpack-sync": "^1.58.0-alpha",
"automattic/jetpack-sync": "^1.58.0",
"automattic/jetpack-plugins-installer": "^0.2.5"
},
"require-dev": {
Expand Down
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.10.7-alpha] - unreleased

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

## [0.10.7] - 2023-10-16
### Changed
- Updated package dependencies.
- Updated package dependencies. [#33429]

## [0.10.6] - 2023-10-10
### Changed
Expand Down Expand Up @@ -424,7 +421,7 @@ This is an alpha version! The changes listed here are not final.
- Updated package dependencies.
- Use Connection/Urls for home_url and site_url functions migrated from Sync.

[0.10.7-alpha]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.6...v0.10.7-alpha
[0.10.7]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.6...v0.10.7
[0.10.6]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.5...v0.10.6
[0.10.5]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.4...v0.10.5
[0.10.4]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.10.3...v0.10.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Identity_Crisis {
/**
* Package Version
*/
const PACKAGE_VERSION = '0.10.7-alpha';
const PACKAGE_VERSION = '0.10.7';

/**
* Instance of the object.
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-my-jetpack/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.8.2-alpha] - unreleased

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

## [3.8.2] - 2023-10-16
### Changed
- Updated package dependencies.
- Updated package dependencies. [#33429, #33584]

## [3.8.1] - 2023-10-10
### Changed
Expand Down Expand Up @@ -1060,7 +1057,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[3.8.2-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.8.1...3.8.2-alpha
[3.8.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.8.1...3.8.2
[3.8.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.8.0...3.8.1
[3.8.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.7.0...3.8.0
[3.7.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.6.0...3.7.0
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.11",
"automattic/wordbless": "@dev",
"automattic/jetpack-videopress": "^0.17.5-alpha"
"automattic/jetpack-videopress": "^0.17.5"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '3.8.2-alpha';
const PACKAGE_VERSION = '3.8.2';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
13 changes: 5 additions & 8 deletions jetpack_vendor/automattic/jetpack-search/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +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).

## [0.39.2-alpha] - unreleased

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

## [0.39.2] - 2023-10-16
### Added
- Added HEIC (`*.heic`) to list of images types allowed to be passed through Photon during instant search
- Added HEIC (`*.heic`) to list of images types allowed to be passed through Photon during instant search. [#33494]

### Changed
- Updated package dependencies.
- Updated package dependencies. [#33429, #33569]

### Fixed
- Search: fixed excluded types option is not available under certain circumstances
- Search: Fixed excluded types option is not available under certain circumstances. [#33548]

## [0.39.1] - 2023-10-10
### Changed
Expand Down Expand Up @@ -825,7 +822,7 @@ This is an alpha version! The changes listed here are not final.
- Updated package dependencies.
- Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't.

[0.39.2-alpha]: https://github.com/Automattic/jetpack-search/compare/v0.39.1...v0.39.2-alpha
[0.39.2]: https://github.com/Automattic/jetpack-search/compare/v0.39.1...v0.39.2
[0.39.1]: https://github.com/Automattic/jetpack-search/compare/v0.39.0...v0.39.1
[0.39.0]: https://github.com/Automattic/jetpack-search/compare/v0.38.8...v0.39.0
[0.38.8]: https://github.com/Automattic/jetpack-search/compare/v0.38.7...v0.38.8
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-status": "^1.18.5",
"automattic/jetpack-config": "^1.15.4",
"automattic/jetpack-my-jetpack": "^3.8.2-alpha"
"automattic/jetpack-my-jetpack": "^3.8.2"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Search package general information
*/
class Package {
const VERSION = '0.39.2-alpha';
const VERSION = '0.39.2';
const SLUG = 'search';

/**
Expand Down
9 changes: 3 additions & 6 deletions jetpack_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).

## [1.58.0-alpha] - unreleased

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

## [1.58.0] - 2023-10-16
### Changed
- Migrated 'jetpack_sync_before_send*' actions for Sync queue to 'jetpack_sync_before_enqueue' instead
- Migrated 'jetpack_sync_before_send*' actions for Sync queue to 'jetpack_sync_before_enqueue' instead. [#33384]

## [1.57.4] - 2023-10-10

Expand Down Expand Up @@ -945,7 +942,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[1.58.0-alpha]: https://github.com/Automattic/jetpack-sync/compare/v1.57.4...v1.58.0-alpha
[1.58.0]: https://github.com/Automattic/jetpack-sync/compare/v1.57.4...v1.58.0
[1.57.4]: https://github.com/Automattic/jetpack-sync/compare/v1.57.3...v1.57.4
[1.57.3]: https://github.com/Automattic/jetpack-sync/compare/v1.57.2...v1.57.3
[1.57.2]: https://github.com/Automattic/jetpack-sync/compare/v1.57.1...v1.57.2
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {
"automattic/jetpack-connection": "^1.58.1",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-identity-crisis": "^0.10.7-alpha",
"automattic/jetpack-identity-crisis": "^0.10.7",
"automattic/jetpack-password-checker": "^0.2.14",
"automattic/jetpack-ip": "^0.1.6",
"automattic/jetpack-roles": "^1.4.25",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '1.58.0-alpha';
const PACKAGE_VERSION = '1.58.0';

const PACKAGE_SLUG = 'sync';

Expand Down
8 changes: 4 additions & 4 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
),
'jetpack-idc' => array(
'path' => 'jetpack_vendor/automattic/jetpack-identity-crisis',
'ver' => '0.10.7-alpha1697047949',
'ver' => '0.10.7',
),
'jetpack-ip' => array(
'path' => 'jetpack_vendor/automattic/jetpack-ip',
Expand All @@ -38,7 +38,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '3.8.2-alpha1697133599',
'ver' => '3.8.2',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand All @@ -50,15 +50,15 @@
),
'jetpack-search-pkg' => array(
'path' => 'jetpack_vendor/automattic/jetpack-search',
'ver' => '0.39.2-alpha1697056620',
'ver' => '0.39.2',
),
'jetpack-stats' => array(
'path' => 'jetpack_vendor/automattic/jetpack-stats',
'ver' => '0.6.5',
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '1.58.0-alpha1697195883',
'ver' => '1.58.0',
),
),
);
Loading

0 comments on commit 63a4204

Please sign in to comment.