Skip to content

Commit

Permalink
MyJetpack: Add jetpack-plans dependency (#33706)
Browse files Browse the repository at this point in the history
* add jetpack-plans dependency

* changelog

* fix versions on all proyects after adding new dependency to my-jetpack

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6588087043
  • Loading branch information
CGastrell authored and matticbot committed Oct 20, 2023
1 parent 0942c26 commit 69bde49
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 84 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"automattic/jetpack-identity-crisis": "^0.11.1",
"automattic/jetpack-publicize": "^0.36.4-alpha",
"automattic/jetpack-connection": "^1.58.2",
"automattic/jetpack-my-jetpack": "^3.9.1",
"automattic/jetpack-my-jetpack": "^3.10.0-alpha",
"automattic/jetpack-sync": "^1.58.1",
"automattic/jetpack-status": "^1.18.5",
"automattic/jetpack-plans": "^0.3.4"
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ 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.10.0-alpha] - unreleased

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

### Added
- Add jetpack-plans dependency. It will be use to restore the reverted change on #33410

## [3.9.1] - 2023-10-19
### Changed
- Make has_required_plan return true (as it was before #33410) as a way to revert the change. [#33697]
Expand Down Expand Up @@ -1069,6 +1076,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package

[3.10.0-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.9.1...3.10.0-alpha
[3.9.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.9.0...3.9.1
[3.9.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.8.2...3.9.0
[3.8.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/3.8.1...3.8.2
Expand Down
5 changes: 3 additions & 2 deletions jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"automattic/jetpack-licensing": "^1.8.4",
"automattic/jetpack-plugins-installer": "^0.2.5",
"automattic/jetpack-redirect": "^1.7.27",
"automattic/jetpack-constants": "^1.6.23"
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-plans": "^0.3.4"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down Expand Up @@ -65,7 +66,7 @@
"link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
},
"branch-alias": {
"dev-trunk": "3.9.x-dev"
"dev-trunk": "3.10.x-dev"
},
"version-constants": {
"::PACKAGE_VERSION": "src/class-initializer.php"
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.9.1';
const PACKAGE_VERSION = '3.10.0-alpha';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '3.9.1',
'ver' => '3.10.0-alpha1697806960',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
55 changes: 28 additions & 27 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "27f79919e5cfb21cdc935dc2147e4a4f730d9644"
"reference": "5be8bc3280880fdff07cb8142fa3243da20c79ca"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -57,7 +57,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "90d213916a3d1cbf7722b5e37765dbfda5fd2dca"
"reference": "381c5913f6dfb77bd5fa46b01f48bea1c8d2638e"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -119,7 +119,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "5f57c16d025659b72da1e420952c4a36bd50d800"
"reference": "7aaff19fed75b3b2cb9a6356c414e50e5a240172"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -187,7 +187,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "4060bd151846ebe942f55c46f3362a3855d3f12e"
"reference": "7e3f9b4095bcfe20212073a411e41d38d69ceeee"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0"
Expand Down Expand Up @@ -252,7 +252,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "7e889f4d8cd9cbfada157d527d9152e4d411c1d5"
"reference": "535bb489e080722233f7896cc6d3c8dc1bf044f7"
},
"require": {
"composer-plugin-api": "^2.1.0"
Expand Down Expand Up @@ -311,7 +311,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "47e05f77d72adc3e948f1357adb803ce0ab6838f"
"reference": "2778a924785aad33dc3be78910dd5c33664b6b56"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11"
Expand Down Expand Up @@ -353,7 +353,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "f4c26aaa6fec30b67affb42ae42c7fd1f99dfb9e"
"reference": "2b4eff487b812d37b8276eaaf92250e6820cb210"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -431,7 +431,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "f8f85d23a1cca4961cb9de1ebddfdd2333864aa9"
"reference": "7d5d1dad15e86630677ac665ea740c4732804829"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -482,7 +482,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "b3865686d86f3fd0f0c127cbfd79096df5c381a9"
"reference": "d357778030a493ae2027680c86e405b6bb777223"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -532,7 +532,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
"reference": "61a81bf299be1f30e5719cea87081efaf2a97c09"
"reference": "6d97d9d1155cdb12999c56839ffeb7c0418d66c1"
},
"require": {
"automattic/jetpack-assets": "^1.18.13",
Expand Down Expand Up @@ -610,7 +610,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "9445a6add6529abbb02d0e39b544d5bcb76b4406"
"reference": "23c8bffd7ada58b5c4e9b643966e35def557dfa2"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -665,7 +665,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "72f317ad09116da971202e5255f795cc0c1d8534"
"reference": "53c743143afb1106c8848501693befd3de7d9448"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22",
Expand Down Expand Up @@ -740,7 +740,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "9c2cb910d8262152fbab4a9280f8c5d2c56fb27e"
"reference": "e64b9452e667893d6ddd52fb623b96fa31b3971f"
},
"require": {
"automattic/jetpack-connection": "^1.58.2"
Expand Down Expand Up @@ -801,7 +801,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "4557249f1ddf4b41a890d96b1d5b276648a21c28"
"reference": "b280fe704ff067670e1c402fa9d27216028456e6"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -846,12 +846,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "3.9.1",
"version_normalized": "3.9.1.0",
"version": "3.10.0-alpha.1697806960",
"version_normalized": "3.10.0.0-alpha1697806960",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "2b11a2f973b235f522515ce32087e21c8ce8c41a"
"reference": "615f88584b2f46204f828527e1e874e7bf75652a"
},
"require": {
"automattic/jetpack-admin-ui": "^0.2.23",
Expand All @@ -860,6 +860,7 @@
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-jitm": "^2.5.1",
"automattic/jetpack-licensing": "^1.8.4",
"automattic/jetpack-plans": "^0.3.4",
"automattic/jetpack-plugins-installer": "^0.2.5",
"automattic/jetpack-redirect": "^1.7.27"
},
Expand All @@ -881,7 +882,7 @@
"link-template": "https://github.com/Automattic/jetpack-my-jetpack/compare/${old}...${new}"
},
"branch-alias": {
"dev-trunk": "3.9.x-dev"
"dev-trunk": "3.10.x-dev"
},
"version-constants": {
"::PACKAGE_VERSION": "src/class-initializer.php"
Expand Down Expand Up @@ -941,7 +942,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-partner",
"reference": "a25663af7c4a60ea35ea95e6b7d7945c54a5608e"
"reference": "2d848a83a90cae1200007b904ada8f78284f0d03"
},
"require": {
"automattic/jetpack-connection": "^1.58.2",
Expand Down Expand Up @@ -1003,7 +1004,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "c85b177c68be930bf350b3c095fe7d4fba4e6cf0"
"reference": "e87bd72c8f67f553b07c68bde814e52fe1cf3540"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1061,7 +1062,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "09a083d4d5b6a075ed6a0ec339b4a90c7f801b7e"
"reference": "f860462c92010b4736c58469ff90709e7648eb8b"
},
"require": {
"automattic/jetpack-connection": "^1.58.2"
Expand Down Expand Up @@ -1128,7 +1129,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "9aea3cefb4dbf6b30b61267f227baa230b027e6a"
"reference": "9c3b6cc3150268b86cbe5135b27a434f54b06d39"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.22"
Expand Down Expand Up @@ -1182,7 +1183,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-publicize",
"reference": "72ff93085b273bd29938e2552b9c2a225a32936e"
"reference": "d8c5c276e4a4e0d8b54a06e8c4ceb34c16d6b76b"
},
"require": {
"automattic/jetpack-assets": "^1.18.13",
Expand Down Expand Up @@ -1261,7 +1262,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "075124d6f6334cec6ab0a76f9816da97692e7d1b"
"reference": "2f08e8916652004ce9efa920d9c2cb21443c8506"
},
"require": {
"automattic/jetpack-status": "^1.18.5"
Expand Down Expand Up @@ -1315,7 +1316,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "6ac25d3f851fa4e5c6c89361841c8ce89700e5c4"
"reference": "83992d2f6927f1d142820ccec601b76c313645e6"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.11",
Expand Down Expand Up @@ -1366,7 +1367,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "ae45c08a9664c99f11eaaec8a3e503bba314e5b9"
"reference": "303dfb6c7a69b2e40a45fa7bb2795ea70c49571b"
},
"require": {
"automattic/jetpack-constants": "^1.6.23"
Expand Down Expand Up @@ -1421,7 +1422,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "26520d608b35581471458b6c89d4f03f299c2432"
"reference": "2ce9357923c5b0b746fceb6cf8e1825abc46383d"
},
"require": {
"automattic/jetpack-connection": "^1.58.2",
Expand Down
Loading

0 comments on commit 69bde49

Please sign in to comment.