Skip to content

Commit

Permalink
Backporting changes from prerelease for 12.4-a.2. (#31703)
Browse files Browse the repository at this point in the history
* Changelog edits.

* Starting 12.4-a.2.

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/5467793693
  • Loading branch information
zinigor authored and matticbot committed Jul 5, 2023
1 parent 90555fb commit 47ae036
Show file tree
Hide file tree
Showing 26 changed files with 275 additions and 296 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"type": "wordpress-plugin",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-assets": "^1.18.6-alpha",
"automattic/jetpack-assets": "^1.18.6",
"automattic/jetpack-admin-ui": "^0.2.20",
"automattic/jetpack-autoloader": "^2.11.21",
"automattic/jetpack-composer-plugin": "^1.1.11",
"automattic/jetpack-config": "^1.15.3",
"automattic/jetpack-identity-crisis": "^0.8.50-alpha",
"automattic/jetpack-my-jetpack": "^3.1.0-alpha",
"automattic/jetpack-identity-crisis": "^0.8.50",
"automattic/jetpack-my-jetpack": "^3.1.0",
"automattic/jetpack-plugins-installer": "^0.2.4",
"automattic/jetpack-sync": "^1.50.2-alpha",
"automattic/jetpack-backup": "^1.16.2-alpha"
"automattic/jetpack-sync": "^1.50.2",
"automattic/jetpack-backup": "^1.16.2"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.0.4",
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-assets/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.18.6-alpha] - unreleased

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

## [1.18.6] - 2023-07-05
### Changed
- Updated package dependencies.
- Updated package dependencies. [#31659]

## [1.18.5] - 2023-06-21
### Changed
Expand Down Expand Up @@ -344,7 +341,7 @@ This is an alpha version! The changes listed here are not final.

- Statically access asset tools

[1.18.6-alpha]: https://github.com/Automattic/jetpack-assets/compare/v1.18.5...v1.18.6-alpha
[1.18.6]: https://github.com/Automattic/jetpack-assets/compare/v1.18.5...v1.18.6
[1.18.5]: https://github.com/Automattic/jetpack-assets/compare/v1.18.4...v1.18.5
[1.18.4]: https://github.com/Automattic/jetpack-assets/compare/v1.18.3...v1.18.4
[1.18.3]: https://github.com/Automattic/jetpack-assets/compare/v1.18.2...v1.18.3
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-backup/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.16.2-alpha] - unreleased

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

## [1.16.2] - 2023-07-05
### Changed
- Updated package dependencies.
- Updated package dependencies. [#31659]

## [1.16.1] - 2023-06-26
### Changed
Expand Down Expand Up @@ -444,7 +441,7 @@ This is an alpha version! The changes listed here are not final.

- Add API endpoints and Jetpack Backup package for managing Help…

[1.16.2-alpha]: https://github.com/Automattic/jetpack-backup/compare/v1.16.1...v1.16.2-alpha
[1.16.2]: https://github.com/Automattic/jetpack-backup/compare/v1.16.1...v1.16.2
[1.16.1]: https://github.com/Automattic/jetpack-backup/compare/v1.16.0...v1.16.1
[1.16.0]: https://github.com/Automattic/jetpack-backup/compare/v1.15.0...v1.16.0
[1.15.0]: https://github.com/Automattic/jetpack-backup/compare/v1.14.0...v1.15.0
Expand Down
8 changes: 4 additions & 4 deletions jetpack_vendor/automattic/jetpack-backup/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-assets": "^1.18.6-alpha",
"automattic/jetpack-assets": "^1.18.6",
"automattic/jetpack-admin-ui": "^0.2.20",
"automattic/jetpack-autoloader": "^2.11.21",
"automattic/jetpack-composer-plugin": "^1.1.11",
"automattic/jetpack-config": "^1.15.3",
"automattic/jetpack-connection": "^1.53.2-alpha",
"automattic/jetpack-identity-crisis": "^0.8.50-alpha",
"automattic/jetpack-sync": "^1.50.2-alpha",
"automattic/jetpack-connection": "^1.53.2",
"automattic/jetpack-identity-crisis": "^0.8.50",
"automattic/jetpack-sync": "^1.50.2",
"automattic/jetpack-status": "^1.17.2"
},
"require-dev": {
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.16.2-alpha';
const PACKAGE_VERSION = '1.16.2';

const PACKAGE_SLUG = 'backup';

Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-connection/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.53.2-alpha] - unreleased

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

## [1.53.2] - 2023-07-05
### Changed
- Updated package dependencies.
- Updated package dependencies. [#31659]

## [1.53.1] - 2023-06-23
### Changed
Expand Down Expand Up @@ -836,7 +833,7 @@ This is an alpha version! The changes listed here are not final.

- Separate the connection library into its own package.

[1.53.2-alpha]: https://github.com/Automattic/jetpack-connection/compare/v1.53.1...v1.53.2-alpha
[1.53.2]: https://github.com/Automattic/jetpack-connection/compare/v1.53.1...v1.53.2
[1.53.1]: https://github.com/Automattic/jetpack-connection/compare/v1.53.0...v1.53.1
[1.53.0]: https://github.com/Automattic/jetpack-connection/compare/v1.52.2...v1.53.0
[1.52.2]: https://github.com/Automattic/jetpack-connection/compare/v1.52.1...v1.52.2
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.53.2-alpha';
const PACKAGE_VERSION = '1.53.2';

const PACKAGE_SLUG = 'connection';

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.8.50-alpha] - unreleased

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

## [0.8.50] - 2023-07-05
### Changed
- Updated package dependencies.
- Updated package dependencies. [#31659]

## [0.8.49] - 2023-06-26
### Changed
Expand Down Expand Up @@ -379,7 +376,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.8.50-alpha]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.49...v0.8.50-alpha
[0.8.50]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.49...v0.8.50
[0.8.49]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.48...v0.8.49
[0.8.48]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.47...v0.8.48
[0.8.47]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.8.46...v0.8.47
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.53.2-alpha",
"automattic/jetpack-connection": "^1.53.2",
"automattic/jetpack-constants": "^1.6.22",
"automattic/jetpack-status": "^1.17.2",
"automattic/jetpack-logo": "^1.6.1",
"automattic/jetpack-assets": "^1.18.6-alpha"
"automattic/jetpack-assets": "^1.18.6"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Identity_Crisis {
/**
* Package Version
*/
const PACKAGE_VERSION = '0.8.50-alpha';
const PACKAGE_VERSION = '0.8.50';

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

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

## [2.3.11] - 2023-07-05
### Changed
- Updated package dependencies.
- Updated package dependencies. [#31659]

## [2.3.10] - 2023-06-23
### Changed
Expand Down Expand Up @@ -596,7 +593,7 @@ This is an alpha version! The changes listed here are not final.

- Update Jetpack to use new JITM package

[2.3.11-alpha]: https://github.com/Automattic/jetpack-jitm/compare/v2.3.10...v2.3.11-alpha
[2.3.11]: https://github.com/Automattic/jetpack-jitm/compare/v2.3.10...v2.3.11
[2.3.10]: https://github.com/Automattic/jetpack-jitm/compare/v2.3.9...v2.3.10
[2.3.9]: https://github.com/Automattic/jetpack-jitm/compare/v2.3.8...v2.3.9
[2.3.8]: https://github.com/Automattic/jetpack-jitm/compare/v2.3.7...v2.3.8
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.20",
"automattic/jetpack-assets": "^1.18.6-alpha",
"automattic/jetpack-connection": "^1.53.2-alpha",
"automattic/jetpack-assets": "^1.18.6",
"automattic/jetpack-connection": "^1.53.2",
"automattic/jetpack-device-detection": "^1.4.26",
"automattic/jetpack-logo": "^1.6.1",
"automattic/jetpack-partner": "^1.7.23",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-jitm/src/class-jitm.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
class JITM {

const PACKAGE_VERSION = '2.3.11-alpha';
const PACKAGE_VERSION = '2.3.11';

/**
* The configuration method that is called from the jetpack-config package.
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-licensing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.53.2-alpha"
"automattic/jetpack-connection": "^1.53.2"
},
"require-dev": {
"automattic/wordbless": "@dev",
Expand Down
17 changes: 7 additions & 10 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@ 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.1.0-alpha] - unreleased

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

## [3.1.0] - 2023-07-05
### Added
- Added Jetpack Stats card to My Jetpack
- Added Jetpack Stats card to My Jetpack [#31589]

### Changed
- Jetpack Stats: Enable skipping interstitial page
- Updated package dependencies.
- Jetpack Stats: Enable skipping interstitial page [#31629]
- Updated package dependencies. [#31659]

### Fixed
- My Jetpack: hide Stats card for standalone plugins
- Organize product cards in list
- My Jetpack: hide Stats card for standalone plugins [#31689]
- Organize product cards in list [#31606]

## [3.0.0] - 2023-06-26
### Added
Expand Down Expand Up @@ -928,7 +925,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[3.1.0-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.0.0...3.1.0-alpha
[3.1.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.0.0...3.1.0
[3.0.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/2.15.0...3.0.0
[2.15.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/2.14.3...2.15.0
[2.14.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/2.14.2...2.14.3
Expand Down
8 changes: 4 additions & 4 deletions jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-admin-ui": "^0.2.20",
"automattic/jetpack-assets": "^1.18.6-alpha",
"automattic/jetpack-connection": "^1.53.2-alpha",
"automattic/jetpack-jitm": "^2.3.11-alpha",
"automattic/jetpack-assets": "^1.18.6",
"automattic/jetpack-connection": "^1.53.2",
"automattic/jetpack-jitm": "^2.3.11",
"automattic/jetpack-licensing": "^1.8.2",
"automattic/jetpack-plugins-installer": "^0.2.4",
"automattic/jetpack-redirect": "^1.7.25",
Expand All @@ -17,7 +17,7 @@
"yoast/phpunit-polyfills": "1.0.4",
"automattic/jetpack-changelogger": "^3.3.5",
"automattic/wordbless": "@dev",
"automattic/jetpack-videopress": "^0.14.8-alpha"
"automattic/jetpack-videopress": "^0.14.8"
},
"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 @@ -31,7 +31,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '3.1.0-alpha';
const PACKAGE_VERSION = '3.1.0';

/**
* Initialize My Jetpack
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-partner/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.53.2-alpha",
"automattic/jetpack-connection": "^1.53.2",
"automattic/jetpack-status": "^1.17.2"
},
"require-dev": {
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.50.2-alpha] - unreleased

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

## [1.50.2] - 2023-07-05
### Added
- Sync wpcom_site_setup site option
- Sync wpcom_site_setup site option [#31662]

## [1.50.1] - 2023-07-04
### Changed
Expand Down Expand Up @@ -881,7 +878,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[1.50.2-alpha]: https://github.com/Automattic/jetpack-sync/compare/v1.50.1...v1.50.2-alpha
[1.50.2]: https://github.com/Automattic/jetpack-sync/compare/v1.50.1...v1.50.2
[1.50.1]: https://github.com/Automattic/jetpack-sync/compare/v1.50.0...v1.50.1
[1.50.0]: https://github.com/Automattic/jetpack-sync/compare/v1.49.0...v1.50.0
[1.49.0]: https://github.com/Automattic/jetpack-sync/compare/v1.48.1...v1.49.0
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.53.2-alpha",
"automattic/jetpack-connection": "^1.53.2",
"automattic/jetpack-constants": "^1.6.22",
"automattic/jetpack-identity-crisis": "^0.8.50-alpha",
"automattic/jetpack-identity-crisis": "^0.8.50",
"automattic/jetpack-password-checker": "^0.2.13",
"automattic/jetpack-ip": "^0.1.4",
"automattic/jetpack-roles": "^1.4.23",
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.50.2-alpha';
const PACKAGE_VERSION = '1.50.2';

const PACKAGE_SLUG = 'sync';

Expand Down
Loading

0 comments on commit 47ae036

Please sign in to comment.