Skip to content

Commit

Permalink
Backport boost 3.6.1 Changes (#40381)
Browse files Browse the repository at this point in the history
  • Loading branch information
dilirity authored and matticbot committed Nov 28, 2024
1 parent b35ff5f commit 1a4f876
Show file tree
Hide file tree
Showing 14 changed files with 191 additions and 200 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"automattic/jetpack-composer-plugin": "^4.0.0",
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-connection": "^6.1.0",
"automattic/jetpack-my-jetpack": "^5.0.4-alpha",
"automattic/jetpack-my-jetpack": "^5.0.4",
"automattic/jetpack-search": "^0.47.2",
"automattic/jetpack-stats": "^0.14.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.0.2-alpha"
"automattic/jetpack-sync": "^4.0.2"
},
"require-dev": {
"automattic/jetpack-changelogger": "^5.1.0",
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-boost-core/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.3.2-alpha] - unreleased

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

## [0.3.2] - 2024-11-28
### Fixed
- Cachable: Make the expiry overridable by child classes.
- Cachable: Make the expiry overridable by child classes. [#40339]

## [0.3.1] - 2024-11-25
### Changed
Expand Down Expand Up @@ -100,7 +97,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Introduce new package. [#31163]

[0.3.2-alpha]: https://github.com/Automattic/jetpack-boost-core/compare/v0.3.1...v0.3.2-alpha
[0.3.2]: https://github.com/Automattic/jetpack-boost-core/compare/v0.3.1...v0.3.2
[0.3.1]: https://github.com/Automattic/jetpack-boost-core/compare/v0.3.0...v0.3.1
[0.3.0]: https://github.com/Automattic/jetpack-boost-core/compare/v0.2.14...v0.3.0
[0.2.14]: https://github.com/Automattic/jetpack-boost-core/compare/v0.2.13...v0.2.14
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"require": {
"php": ">=7.2",
"automattic/jetpack-boost-core": "^0.3.2-alpha"
"automattic/jetpack-boost-core": "^0.3.2"
},
"autoload": {
"classmap": [
Expand Down
13 changes: 5 additions & 8 deletions jetpack_vendor/automattic/jetpack-my-jetpack/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).

## [5.0.4-alpha] - unreleased

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

## [5.0.4] - 2024-11-28
### Added
- Added "Expired" & "Expires soon" statuses to My Jetpack product cards.
- Added "Expired" & "Expires soon" statuses to My Jetpack product cards. [#39816]

### Changed
- Social | Changed My Jetpack CTA for Social from "Learn more" to "Activate"
- Social | Changed My Jetpack CTA for Social from "Learn more" to "Activate" [#40359]

### Fixed
- Fix stats not showing sale discount
- Fix stats not showing sale discount [#40348]

## [5.0.3] - 2024-11-26
### Changed
Expand Down Expand Up @@ -1841,7 +1838,7 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[5.0.4-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.3...5.0.4-alpha
[5.0.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.3...5.0.4
[5.0.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.2...5.0.3
[5.0.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.1...5.0.2
[5.0.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/5.0.0...5.0.1
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 @@
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.0.2-alpha",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-protect-status": "^0.3.1"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '5.0.4-alpha';
const PACKAGE_VERSION = '5.0.4';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.2",
"automattic/jetpack-connection": "^6.1.0",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-sync": "^4.0.2-alpha",
"automattic/jetpack-sync": "^4.0.2",
"automattic/jetpack-protect-models": "^0.4.1",
"automattic/jetpack-plans": "^0.5.1"
},
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-config": "^3.0.0",
"automattic/jetpack-my-jetpack": "^5.0.4-alpha",
"automattic/jetpack-sync": "^4.0.2-alpha"
"automattic/jetpack-my-jetpack": "^5.0.4",
"automattic/jetpack-sync": "^4.0.2"
},
"require-dev": {
"automattic/jetpack-changelogger": "^5.1.0",
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).

## [4.0.2-alpha] - unreleased

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

## [4.0.2] - 2024-11-28
### Fixed
- Sync: Fixed bug in checksum histogram when max_range is PHP_INT_MAX
- Sync: Fixed bug in checksum histogram when max_range is PHP_INT_MAX [#40309]

## [4.0.1] - 2024-11-25
### Changed
Expand Down Expand Up @@ -1354,7 +1351,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[4.0.2-alpha]: https://github.com/Automattic/jetpack-sync/compare/v4.0.1...v4.0.2-alpha
[4.0.2]: https://github.com/Automattic/jetpack-sync/compare/v4.0.1...v4.0.2
[4.0.1]: https://github.com/Automattic/jetpack-sync/compare/v4.0.0...v4.0.1
[4.0.0]: https://github.com/Automattic/jetpack-sync/compare/v3.15.0...v4.0.0
[3.15.0]: https://github.com/Automattic/jetpack-sync/compare/v3.14.4...v3.15.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '4.0.2-alpha';
const PACKAGE_VERSION = '4.0.2';

const PACKAGE_SLUG = 'sync';

Expand Down
6 changes: 3 additions & 3 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
),
'jetpack-boost-core' => array(
'path' => 'jetpack_vendor/automattic/jetpack-boost-core',
'ver' => '0.3.2-alpha1732789065',
'ver' => '0.3.2',
),
'jetpack-boost-speed-score' => array(
'path' => 'jetpack_vendor/automattic/jetpack-boost-speed-score',
Expand Down Expand Up @@ -46,7 +46,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '5.0.4-alpha1732736929',
'ver' => '5.0.4',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down Expand Up @@ -74,7 +74,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '4.0.2-alpha1732712411',
'ver' => '4.0.2',
),
),
);
Loading

0 comments on commit 1a4f876

Please sign in to comment.