Skip to content

Commit

Permalink
Backport automattic-for-agencies-client 0.4.0 Changes (#40936)
Browse files Browse the repository at this point in the history
* Changelog and readme.txt edits.

* Changelog tweaks

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12697123832

Upstream-Ref: Automattic/jetpack@4d4b0ea
  • Loading branch information
tbradsha authored and matticbot committed Jan 9, 2025
1 parent e191d80 commit 50a6ea5
Show file tree
Hide file tree
Showing 9 changed files with 126 additions and 129 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-publicize": "^0.57.2-alpha",
"automattic/jetpack-connection": "^6.2.2",
"automattic/jetpack-my-jetpack": "^5.3.1-alpha",
"automattic/jetpack-sync": "^4.3.0-alpha",
"automattic/jetpack-sync": "^4.3.0",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-post-list": "^0.7.3-alpha"
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.3.0-alpha",
"automattic/jetpack-sync": "^4.3.0",
"automattic/jetpack-protect-status": "^0.4.1"
},
"require-dev": {
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.2.2",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-sync": "^4.3.0-alpha",
"automattic/jetpack-sync": "^4.3.0",
"automattic/jetpack-protect-models": "^0.4.1",
"automattic/jetpack-plans": "^0.5.1"
},
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.3.0-alpha] - unreleased

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

## [4.3.0] - 2025-01-09
### Added
- Instant Search: add taxonomies for a8c-support-theme kb_article cpt.
- Instant Search: add taxonomies for a8c-support-theme kb_article cpt. [#38660]

## [4.2.0] - 2024-12-23
### Added
Expand Down Expand Up @@ -1370,7 +1367,7 @@ This is an alpha version! The changes listed here are not final.

- Packages: Move sync to a classmapped package

[4.3.0-alpha]: https://github.com/Automattic/jetpack-sync/compare/v4.2.0...v4.3.0-alpha
[4.3.0]: https://github.com/Automattic/jetpack-sync/compare/v4.2.0...v4.3.0
[4.2.0]: https://github.com/Automattic/jetpack-sync/compare/v4.1.1...v4.2.0
[4.1.1]: https://github.com/Automattic/jetpack-sync/compare/v4.1.0...v4.1.1
[4.1.0]: https://github.com/Automattic/jetpack-sync/compare/v4.0.2...v4.1.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.3.0-alpha';
const PACKAGE_VERSION = '4.3.0';

const PACKAGE_SLUG = 'sync';

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 @@ -74,7 +74,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '4.3.0-alpha1736289477',
'ver' => '4.3.0',
),
),
);
64 changes: 32 additions & 32 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": "3d0fa6ca7f91eb097605767ea5b9ae2b117ce443"
"reference": "2774b33f2c3707a2bbcc6edc2ede21bfc4bb60fd"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -63,7 +63,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "29f65fa1e5c5fb69a48524a53076be113c27ecc1"
"reference": "ad02de6bcd47be9eb89950617f73c2e6c03454e1"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -131,7 +131,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "a68f1b0a84cf1b9c852a99348293f0a650d9b192"
"reference": "4f52f371fe25b1db277632f6600948d7c6b9aebe"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -203,7 +203,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "cdde3a20c24622071c2374f6705fdc5254f8ab96"
"reference": "c7811fd9d8247efd0272e0c2fe581bdcc1b0a392"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -274,7 +274,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
"reference": "018725189dd3b0a3c0182880c422dc6113eac07d"
"reference": "fd2096fe15e9e872196b288f3dc849d7e5ce25ed"
},
"require": {
"automattic/jetpack-connection": "^6.2.2",
Expand Down Expand Up @@ -345,7 +345,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
"reference": "992f479b8c283669f32ae8ad10cd64e001ecc216"
"reference": "5db45563307c6e2e296784cc9b7ee14be2d4dbc0"
},
"require": {
"automattic/jetpack-boost-core": "^0.3.3",
Expand Down Expand Up @@ -424,7 +424,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "20f2fde1b72039d788d3e6d91d0621693165fa66"
"reference": "15b0b78af58b86cd14f5306c4e6215bebafd3aa7"
},
"require": {
"composer-plugin-api": "^2.2",
Expand Down Expand Up @@ -487,7 +487,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "848c63acab6151eaf9d670bd275d1e66d14bc2ae"
"reference": "fcb71dc6a259326361852bbd3c49c0186e0e2b65"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -562,7 +562,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "eaff0d2da6581db4311771ee8f22f90013fb57e7"
"reference": "7252eac69b44d51cf901f17f3796029d42d7e021"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -655,7 +655,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "8608a471b27efd161deed71a604669d6022daa53"
"reference": "e828babd86edba11517eeeb65b5d3a42dff5eafe"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -712,7 +712,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "dc885b953ef6d7f1a50230c71027d50ba6c57f77"
"reference": "599fa047b8afdeb4d70425decfd8456c8321bc9a"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -768,7 +768,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-explat",
"reference": "c692fc0cd19fd8134da631cbe6058dc7f02d397a"
"reference": "f464a56ff2411a2c13a47be66a31c6663c24014a"
},
"require": {
"automattic/jetpack-connection": "^6.2.2",
Expand Down Expand Up @@ -846,7 +846,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "159b8285ac380593114d8576d1799d1b3be0ecfa"
"reference": "2b5c782304fda88365bcc635cbb4ae739e1570a0"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -907,7 +907,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "dd686b6311aef078aac36f4c3814879c66fccfb6"
"reference": "6af7b9f79176ad6b68d5e376ec03ecbad0eeeb5d"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -985,7 +985,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "b59f9a888f88173d4cd9cd81e579c3ea7c90cc7c"
"reference": "199b53d5ddadd5e2cbb2b9fede7b557bd1d0b3dc"
},
"require": {
"automattic/jetpack-connection": "^6.2.2",
Expand Down Expand Up @@ -1050,7 +1050,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "bc7e95ea559800a0de28455f8884523e4996f45c"
"reference": "b9fa75b2b0c2406f13ba5126c0469df941328d55"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1106,7 +1106,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "cec2247c65550033d99ebb91c2c3037b4dee15ed"
"reference": "39389b1176c80da43b9b46edfef9d1d3274ed90b"
},
"require": {
"automattic/jetpack-admin-ui": "^0.5.1",
Expand All @@ -1122,7 +1122,7 @@
"automattic/jetpack-protect-status": "^0.4.1",
"automattic/jetpack-redirect": "^3.0.1",
"automattic/jetpack-status": "^5.0.1",
"automattic/jetpack-sync": "^4.3.0-alpha",
"automattic/jetpack-sync": "^4.3.0",
"php": ">=7.2"
},
"require-dev": {
Expand Down Expand Up @@ -1211,7 +1211,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "288fd85dc2619a465a0b038edf804af19e9e5f58"
"reference": "937a3423b451797eea69753a3ff42de7f66bcce1"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1275,7 +1275,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "59553d19a12e7e2f73013e2d413694a42658dd3b"
"reference": "8c424cc8a8a3f1730da8b4d64295ec8c02c05406"
},
"require": {
"automattic/jetpack-connection": "^6.2.2",
Expand Down Expand Up @@ -1346,7 +1346,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "3156f05e435b97d138ebc9f858f9a0327abfd30f"
"reference": "2b89bfab690a3f65cfac7859e1517ce80da0a761"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
Expand Down Expand Up @@ -1405,7 +1405,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-post-list",
"reference": "534ecab31f9a90b28bd2ec0e9e09519e54fac55f"
"reference": "f3038cf219a2acb14d5343f67c9302a14682b83f"
},
"require": {
"automattic/jetpack-assets": "^4.0.2",
Expand Down Expand Up @@ -1473,7 +1473,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-models",
"reference": "3556fd7990c49832383985863442acf4714034bf"
"reference": "c2986d4b96dd83a5ff6a260a2ddcc31420828b88"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1546,14 +1546,14 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-protect-status",
"reference": "90db2403ce110681a4141ae3fcfa0c41a5bf9823"
"reference": "13f430bf5e898d18fb58a88991b3227dc303cb0e"
},
"require": {
"automattic/jetpack-connection": "^6.2.2",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-plugins-installer": "^0.5.0",
"automattic/jetpack-protect-models": "^0.4.1",
"automattic/jetpack-sync": "^4.3.0-alpha",
"automattic/jetpack-sync": "^4.3.0",
"php": ">=7.2"
},
"require-dev": {
Expand Down Expand Up @@ -1624,7 +1624,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-publicize",
"reference": "b1659b538ce6c880c700448d36f3b12514836455"
"reference": "b3b4c2d177171086a29cbe9acfbb57db55cfe1c7"
},
"require": {
"automattic/jetpack-assets": "^4.0.2",
Expand Down Expand Up @@ -1709,7 +1709,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "01b5958d1f791f4c7ad27218ee8f2f57bd21defc"
"reference": "3521f7e46dbd30b5f7f7ada48382973f24f5c3bc"
},
"require": {
"automattic/jetpack-status": "^5.0.1",
Expand Down Expand Up @@ -1767,7 +1767,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "275ab8fa7912e77c233cd420ca48df3e5c04c3a9"
"reference": "d6fba7305d87f8b2ecbdb65525bed75771d5aed0"
},
"require": {
"php": ">=7.2"
Expand Down Expand Up @@ -1824,7 +1824,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "f8a4d6485f79e7a901a06175ef05c9ad298fb1f9"
"reference": "9b1397c70d6a25d33aa0924cbaaa4184e0e4eef2"
},
"require": {
"automattic/jetpack-constants": "^3.0.1",
Expand Down Expand Up @@ -1886,12 +1886,12 @@
},
{
"name": "automattic/jetpack-sync",
"version": "4.3.0-alpha.1736289477",
"version_normalized": "4.3.0.0-alpha1736289477",
"version": "4.3.0",
"version_normalized": "4.3.0.0",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "449e6e29d4269d58ada52d0b743cb56929009869"
"reference": "11cf52775da6fedc94e7947895e32ea240985767"
},
"require": {
"automattic/jetpack-connection": "^6.2.2",
Expand Down
Loading

0 comments on commit 50a6ea5

Please sign in to comment.