Backport boost 3.4.1-beta Changes (#37793)

* Changelog and readme.txt edits. * Init new plugin cycle * Revert "Init new plugin cycle" This reverts commit 2e789e6be829c2c85bce0d1eba33081bc865c8ea. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/9466511536 Upstream-Ref: Automattic/jetpack@6c3a1d3
Automattic · Jun 11, 2024 · ce3a0cf · ce3a0cf
1 parent 6a528e4
commit ce3a0cf
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 95 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
 		"automattic/jetpack-composer-plugin": "^2.0.2",
 		"automattic/jetpack-config": "^2.0.3",
 		"automattic/jetpack-connection": "^2.10.0",
-		"automattic/jetpack-my-jetpack": "^4.24.6-alpha",
+		"automattic/jetpack-my-jetpack": "^4.24.6",
 		"automattic/jetpack-search": "^0.44.9",
 		"automattic/jetpack-stats": "^0.13.0",
 		"automattic/jetpack-status": "^3.3.0",

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
@@ -5,13 +5,10 @@ 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.24.6-alpha] - unreleased
-
-This is an alpha version! The changes listed here are not final.
-
+## [4.24.6] - 2024-06-11
 ### Changed
-- Conditionally show connection banner as error or info
-- Updated package dependencies.
+- Conditionally show connection banner as error or info [#37707]
+- Updated package dependencies. [#37779]
 
 ## [4.24.5] - 2024-06-10
 ### Changed
@@ -1515,7 +1512,7 @@ This is an alpha version! The changes listed here are not final.
 ### Added
 - Created package
 
-[4.24.6-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.5...4.24.6-alpha
+[4.24.6]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.5...4.24.6
 [4.24.5]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.4...4.24.5
 [4.24.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.3...4.24.4
 [4.24.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.24.2...4.24.3

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php b/jetpack_vendor/automattic/jetpack-my-jetpack/src/class-initializer.php
@@ -37,7 +37,7 @@ class Initializer {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '4.24.6-alpha';
+	const PACKAGE_VERSION = '4.24.6';
 
 	/**
 	 * HTML container ID for the IDC screen on My Jetpack page.

diff --git a/jetpack_vendor/automattic/jetpack-search/composer.json b/jetpack_vendor/automattic/jetpack-search/composer.json
@@ -10,7 +10,7 @@
 		"automattic/jetpack-constants": "^2.0.3",
 		"automattic/jetpack-status": "^3.3.0",
 		"automattic/jetpack-config": "^2.0.3",
-		"automattic/jetpack-my-jetpack": "^4.24.6-alpha",
+		"automattic/jetpack-my-jetpack": "^4.24.6",
 		"automattic/jetpack-sync": "^3.1.0"
 	},
 	"require-dev": {

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -42,7 +42,7 @@
     ),
     'jetpack-my-jetpack' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
-      'ver' => '4.24.6-alpha1718109678',
+      'ver' => '4.24.6',
     ),
     'jetpack-password-checker' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-password-checker',

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "e4e9c153fc7bbc7320ef1d543b4528ca1a473ace"
+                "reference": "f43001cdfdcd84aac9b3810c07388c5fed140524"
             },
             "require": {
                 "php": ">=7.0"
@@ -60,7 +60,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "87b51d75bf4a828d12fc8acd6aa54d5b3001d34d"
+                "reference": "133cb005c339195c6628669dc6cd0749ed9e7e72"
             },
             "require": {
                 "php": ">=7.0"
@@ -125,7 +125,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "87cbe9086892e82ef944e4f132c4d7d1659c7af5"
+                "reference": "1cc579e7b3dfe012d90c587c2fbece88966d969e"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.3",
@@ -194,7 +194,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "a164843b4233d8c4b2c87ac0d119f2960136f99b"
+                "reference": "0bb6baa6f8cf4ad73c0c8abbb30ed25e98f14765"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0",
@@ -261,7 +261,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-core",
-                "reference": "ddef3fef7bf73cce091f576868a2e35eb42ea7e1"
+                "reference": "38974ba112338bd166414f0aadeb0755c2b665eb"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.0",
@@ -329,7 +329,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-boost-speed-score",
-                "reference": "924fb3e7d6d246b99475854483aa0e04a40bb8e0"
+                "reference": "2326ccb358fbad949133c737b898b9c4d72d5dc8"
             },
             "require": {
                 "automattic/jetpack-boost-core": "^0.2.7",
@@ -405,7 +405,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "35cf5214783a10cec64c2f306cd4598f5f77eb30"
+                "reference": "cbc7680d9f8ebe3dbbf1a5b0b2703dd465e9d6df"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0",
@@ -465,7 +465,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "fde89e05bd8b93013f2ba178b6330d764e9cd5b2"
+                "reference": "80a08cda6e79a59090a5de42af28c70d716cf938"
             },
             "require": {
                 "php": ">=7.0"
@@ -541,7 +541,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "1822a846c891ff1b31809637341de07882119f10"
+                "reference": "f3685a848087e30612df605c721e32dca69a80d6"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.1",
@@ -628,7 +628,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "144286d51ae057c20441d6994d0db5171d1d7066"
+                "reference": "781b54acd49d1d8e0f9e0b0d4b04dcc6ef1274d4"
             },
             "require": {
                 "php": ">=7.0"
@@ -682,7 +682,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "b9907b2db79f4f9373518603799efca245cb408c"
+                "reference": "25355633da0cb71344c638b8e83de0ff14f7ece9"
             },
             "require": {
                 "php": ">=7.0"
@@ -735,7 +735,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "8050033f2a49ee6dc4c094a6139e100135348706"
+                "reference": "6e523c600337991c43bb7770ce258129aba8abd1"
             },
             "require": {
                 "php": ">=7.0"
@@ -793,7 +793,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "c8478e826c1e6667ceb858791b8667daeb0af559"
+                "reference": "008ac91073940a7116d0ff78d6f55c0ede7b26d3"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.1",
@@ -868,7 +868,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "fd299a064175d19620587a3bbdff948e8671d7a6"
+                "reference": "8949bb2fcd7a7dd591671695d81d1d8679d804a2"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.0",
@@ -930,7 +930,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "5c58f3b1abe578146343bf750e991dddd35f8182"
+                "reference": "7d06cc8d59b86757e9f0faa121495960a7d676cf"
             },
             "require": {
                 "php": ">=7.0"
@@ -978,12 +978,12 @@
         },
         {
             "name": "automattic/jetpack-my-jetpack",
-            "version": "4.24.6-alpha.1718109678",
-            "version_normalized": "4.24.6.0-alpha1718109678",
+            "version": "4.24.6",
+            "version_normalized": "4.24.6.0",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "17467a07510b9a21f0e3361d9308d16dc97db6ca"
+                "reference": "ac4e3f7f601a4925d3af089b0763a8292ffb8399"
             },
             "require": {
                 "automattic/jetpack-admin-ui": "^0.4.2",
@@ -1082,7 +1082,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "43c134f9a7456204a0ce99acc0e0be113aa21bea"
+                "reference": "ac9f08c68b93d7d0271b8ddd7ae9808e93a78835"
             },
             "require": {
                 "php": ">=7.0"
@@ -1143,7 +1143,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plans",
-                "reference": "c20e9c677edcae6f6f786f5683dca46eb81796da"
+                "reference": "b6688650fda6fd83bf5ed22a46c16664ce03e5f2"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.0",
@@ -1211,7 +1211,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "1ed253b35428b3e07ce65e378f0926d0e8e0a71b"
+                "reference": "07644e6cdf0b72360c1b3a4795f279e3402b3fdd"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^2.0.1",
@@ -1267,7 +1267,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "e7ffd35b41166d60b19100f9bb64add95bf1fa77"
+                "reference": "bf3ad72e33c3f14369b5e8246afe1dc846931406"
             },
             "require": {
                 "automattic/jetpack-status": "^3.3.0",
@@ -1322,7 +1322,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "ff009f23ec92fb9fda3c4f077c774ddb00500334"
+                "reference": "dc539157d5af9b01411c365cf99514d907bd3698"
             },
             "require": {
                 "php": ">=7.0"
@@ -1376,14 +1376,14 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-search",
-                "reference": "4373772de2ef66d57b3806f68b2a773db95d3431"
+                "reference": "b3b959b167fec7c56f84efda2bb09ddd597bfeb9"
             },
             "require": {
                 "automattic/jetpack-assets": "^2.1.12",
                 "automattic/jetpack-config": "^2.0.3",
                 "automattic/jetpack-connection": "^2.10.0",
                 "automattic/jetpack-constants": "^2.0.3",
-                "automattic/jetpack-my-jetpack": "^4.24.6-alpha",
+                "automattic/jetpack-my-jetpack": "^4.24.6",
                 "automattic/jetpack-status": "^3.3.0",
                 "automattic/jetpack-sync": "^3.1.0",
                 "php": ">=7.0"
@@ -1464,7 +1464,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats",
-                "reference": "ff25d3038cbec14c24a2d7c6ec49945d4fedafe9"
+                "reference": "af3e85ed25b5251629b9b5d60a7d6bfc2c5fdb3d"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.0",
@@ -1531,7 +1531,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "ce28015623f5cd0cb48a1428b0a6f35bfa5bbbfd"
+                "reference": "c59d185501b08a1dc6c9c8fa57bd221886615755"
             },
             "require": {
                 "automattic/jetpack-constants": "^2.0.3",
@@ -1596,7 +1596,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "4db4d1705942e9db212d6f71c871c17f81f4747d"
+                "reference": "1ea660861fd6d7b50fd02dc599cc32f5eef8d927"
             },
             "require": {
                 "automattic/jetpack-connection": "^2.10.0",