Skip to content

Commit

Permalink
Backport backup 3.0 Changes (#40194)
Browse files Browse the repository at this point in the history
  • Loading branch information
Initsogar authored and matticbot committed Nov 14, 2024
1 parent 8d2fbd6 commit 8d46fd2
Show file tree
Hide file tree
Showing 51 changed files with 480 additions and 525 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"autoload": {
"classmap": [
Expand Down
268 changes: 134 additions & 134 deletions composer.lock

Large diffs are not rendered by default.

9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-a8c-mc-stats/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.0.0-alpha] - unreleased

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

## [3.0.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2.
- General: Update minimum PHP version to 7.2. [#40147]

## [2.0.4] - 2024-11-04
### Added
Expand Down Expand Up @@ -154,7 +151,7 @@ This is an alpha version! The changes listed here are not final.

- Creates the MC Stats package

[3.0.0-alpha]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.4...v3.0.0-alpha
[3.0.0]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.4...v3.0.0
[2.0.4]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.3...v2.0.4
[2.0.3]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.2...v2.0.3
[2.0.2]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v2.0.1...v2.0.2
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-a8c-mc-stats/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-admin-ui/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.5.0-alpha] - unreleased

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

## [0.5.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2.
- General: Update minimum PHP version to 7.2. [#40147]

## [0.4.6] - 2024-11-04
### Added
Expand Down Expand Up @@ -171,7 +168,7 @@ This is an alpha version! The changes listed here are not final.
### Fixed
- Fixing menu visibility issues.

[0.5.0-alpha]: https://github.com/Automattic/jetpack-admin-ui/compare/0.4.6...0.5.0-alpha
[0.5.0]: https://github.com/Automattic/jetpack-admin-ui/compare/0.4.6...0.5.0
[0.4.6]: https://github.com/Automattic/jetpack-admin-ui/compare/0.4.5...0.4.6
[0.4.5]: https://github.com/Automattic/jetpack-admin-ui/compare/0.4.4...0.4.5
[0.4.4]: https://github.com/Automattic/jetpack-admin-ui/compare/0.4.3...0.4.4
Expand Down
4 changes: 2 additions & 2 deletions vendor/automattic/jetpack-admin-ui/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha",
"automattic/jetpack-logo": "^3.0.0-alpha",
"automattic/jetpack-changelogger": "^5.0.0",
"automattic/jetpack-logo": "^3.0.0",
"automattic/wordbless": "dev-master"
},
"suggest": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
class Admin_Menu {

const PACKAGE_VERSION = '0.5.0-alpha';
const PACKAGE_VERSION = '0.5.0';

/**
* Whether this class has been initialized
Expand Down
9 changes: 3 additions & 6 deletions 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).

## [3.0.0-alpha] - unreleased

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

## [3.0.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2.
- General: Update minimum PHP version to 7.2. [#40147]

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

- Statically access asset tools

[3.0.0-alpha]: https://github.com/Automattic/jetpack-assets/compare/v2.3.14...v3.0.0-alpha
[3.0.0]: https://github.com/Automattic/jetpack-assets/compare/v2.3.14...v3.0.0
[2.3.14]: https://github.com/Automattic/jetpack-assets/compare/v2.3.13...v2.3.14
[2.3.13]: https://github.com/Automattic/jetpack-assets/compare/v2.3.12...v2.3.13
[2.3.12]: https://github.com/Automattic/jetpack-assets/compare/v2.3.11...v2.3.12
Expand Down
4 changes: 2 additions & 2 deletions vendor/automattic/jetpack-assets/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-constants": "^3.0.0-alpha"
"automattic/jetpack-constants": "^3.0.0"
},
"require-dev": {
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha",
"automattic/jetpack-changelogger": "^5.0.0",
"wikimedia/testing-access-wrapper": "^1.0 || ^2.0 || ^3.0"
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"validate": "pnpm exec validate-es build/"
},
"dependencies": {
"@automattic/jetpack-script-data": "^0.1.4",
"@automattic/jetpack-script-data": "^0.1.5",
"react": "18.3.1"
},
"devDependencies": {
Expand Down
16 changes: 8 additions & 8 deletions vendor/automattic/jetpack-blaze/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-assets": "^3.0.0-alpha",
"automattic/jetpack-connection": "^6.0.0-alpha",
"automattic/jetpack-constants": "^3.0.0-alpha",
"automattic/jetpack-plans": "^0.5.0-alpha",
"automattic/jetpack-redirect": "^3.0.0-alpha",
"automattic/jetpack-status": "^5.0.0-alpha",
"automattic/jetpack-sync": "^4.0.0-alpha"
"automattic/jetpack-assets": "^3.0.0",
"automattic/jetpack-connection": "^6.0.0",
"automattic/jetpack-constants": "^3.0.0",
"automattic/jetpack-plans": "^0.5.0",
"automattic/jetpack-redirect": "^3.0.0",
"automattic/jetpack-status": "^5.0.0",
"automattic/jetpack-sync": "^4.0.0"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha",
"automattic/jetpack-changelogger": "^5.0.0",
"automattic/wordbless": "@dev"
},
"suggest": {
Expand Down
4 changes: 2 additions & 2 deletions vendor/automattic/jetpack-blocks/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-constants": "^3.0.0-alpha"
"automattic/jetpack-constants": "^3.0.0"
},
"require-dev": {
"automattic/wordbless": "dev-master",
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
6 changes: 3 additions & 3 deletions vendor/automattic/jetpack-calypsoify/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-assets": "^3.0.0-alpha",
"automattic/jetpack-status": "^5.0.0-alpha"
"automattic/jetpack-assets": "^3.0.0",
"automattic/jetpack-status": "^5.0.0"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"autoload": {
"classmap": [
Expand Down
4 changes: 2 additions & 2 deletions vendor/automattic/jetpack-classic-theme-helper/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-assets": "^3.0.0-alpha"
"automattic/jetpack-assets": "^3.0.0"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha",
"automattic/jetpack-changelogger": "^5.0.0",
"automattic/wordbless": "dev-master"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-compat/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.2"
},
"require-dev": {
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
9 changes: 3 additions & 6 deletions 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).

## [6.0.0-alpha] - unreleased

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

## [6.0.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2.
- General: Update minimum PHP version to 7.2. [#40147]

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

- Separate the connection library into its own package.

[6.0.0-alpha]: https://github.com/Automattic/jetpack-connection/compare/v5.1.7...v6.0.0-alpha
[6.0.0]: https://github.com/Automattic/jetpack-connection/compare/v5.1.7...v6.0.0
[5.1.7]: https://github.com/Automattic/jetpack-connection/compare/v5.1.6...v5.1.7
[5.1.6]: https://github.com/Automattic/jetpack-connection/compare/v5.1.5...v5.1.6
[5.1.5]: https://github.com/Automattic/jetpack-connection/compare/v5.1.4...v5.1.5
Expand Down
16 changes: 8 additions & 8 deletions vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-a8c-mc-stats": "^3.0.0-alpha",
"automattic/jetpack-admin-ui": "^0.5.0-alpha",
"automattic/jetpack-assets": "^3.0.0-alpha",
"automattic/jetpack-constants": "^3.0.0-alpha",
"automattic/jetpack-roles": "^3.0.0-alpha",
"automattic/jetpack-status": "^5.0.0-alpha",
"automattic/jetpack-redirect": "^3.0.0-alpha"
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
"automattic/jetpack-admin-ui": "^0.5.0",
"automattic/jetpack-assets": "^3.0.0",
"automattic/jetpack-constants": "^3.0.0",
"automattic/jetpack-roles": "^3.0.0",
"automattic/jetpack-status": "^5.0.0",
"automattic/jetpack-redirect": "^3.0.0"
},
"require-dev": {
"automattic/wordbless": "@dev",
"yoast/phpunit-polyfills": "^1.1.1",
"brain/monkey": "2.6.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"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 @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '6.0.0-alpha';
const PACKAGE_VERSION = '6.0.0';

const PACKAGE_SLUG = 'connection';

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

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

## [3.0.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2.
- General: Update minimum PHP version to 7.2. [#40147]

## [2.0.5] - 2024-11-04
### Added
Expand Down Expand Up @@ -185,7 +182,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Finish the constants package

[3.0.0-alpha]: https://github.com/Automattic/jetpack-constants/compare/v2.0.5...v3.0.0-alpha
[3.0.0]: https://github.com/Automattic/jetpack-constants/compare/v2.0.5...v3.0.0
[2.0.5]: https://github.com/Automattic/jetpack-constants/compare/v2.0.4...v2.0.5
[2.0.4]: https://github.com/Automattic/jetpack-constants/compare/v2.0.3...v2.0.4
[2.0.3]: https://github.com/Automattic/jetpack-constants/compare/v2.0.2...v2.0.3
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-constants/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"require-dev": {
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-device-detection/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.0.0-alpha] - unreleased

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

## [3.0.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2.
- General: Update minimum PHP version to 7.2. [#40147]

## [2.1.6] - 2024-11-04
### Added
Expand Down Expand Up @@ -215,7 +212,7 @@ This is an alpha version! The changes listed here are not final.

- Moving jetpack_is_mobile into a package

[3.0.0-alpha]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.6...v3.0.0-alpha
[3.0.0]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.6...v3.0.0
[2.1.6]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.5...v2.1.6
[2.1.5]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.4...v2.1.5
[2.1.4]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.3...v2.1.4
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-device-detection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
4 changes: 2 additions & 2 deletions vendor/automattic/jetpack-google-analytics/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-status": "^5.0.0-alpha"
"automattic/jetpack-status": "^5.0.0"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha",
"automattic/jetpack-changelogger": "^5.0.0",
"automattic/wordbless": "^0.4.2"
},
"autoload": {
Expand Down
9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-ip/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.4.0-alpha] - unreleased

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

## [0.4.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2.
- General: Update minimum PHP version to 7.2. [#40147]

## [0.3.1] - 2024-11-04
### Added
Expand Down Expand Up @@ -69,7 +66,7 @@ This is an alpha version! The changes listed here are not final.
- Add jetpack-ip package functionality [#28846]
- Initialized the package. [#28765]

[0.4.0-alpha]: https://github.com/automattic/jetpack-ip/compare/v0.3.1...v0.4.0-alpha
[0.4.0]: https://github.com/automattic/jetpack-ip/compare/v0.3.1...v0.4.0
[0.3.1]: https://github.com/automattic/jetpack-ip/compare/v0.3.0...v0.3.1
[0.3.0]: https://github.com/automattic/jetpack-ip/compare/v0.2.3...v0.3.0
[0.2.3]: https://github.com/automattic/jetpack-ip/compare/v0.2.2...v0.2.3
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-ip/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"require-dev": {
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0-alpha"
"automattic/jetpack-changelogger": "^5.0.0"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-ip/src/class-utils.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Utils {

const PACKAGE_VERSION = '0.4.0-alpha';
const PACKAGE_VERSION = '0.4.0';

/**
* Get the current user's IP address.
Expand Down
Loading

0 comments on commit 8d46fd2

Please sign in to comment.