From 73b428d2fce397fd874b3056ad3120c343bc1a0c Mon Sep 17 00:00:00 2001 From: tbradsha Date: Mon, 4 Nov 2024 15:35:02 +0000 Subject: [PATCH] Backport jetpack 14.0-beta Changes (#40024) * Changelog and readme.txt edits. * Amend readme.txt Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11667212003 Upstream-Ref: Automattic/jetpack@a7dc7da7dd2fc2c67fbe61abe8c8df4a7254260a --- composer.json | 4 ++-- composer.lock | 12 ++++++------ .../automattic/jetpack-device-detection/CHANGELOG.md | 9 +++------ .../jetpack-device-detection/composer.json | 2 +- vendor/composer/installed.json | 8 ++++---- vendor/composer/installed.php | 6 +++--- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index e41550bb..5751275c 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "type": "wordpress-plugin", "license": "GPL-2.0-or-later", "require": { - "automattic/jetpack-device-detection": "^2.1.6-alpha" + "automattic/jetpack-device-detection": "^2.1.6" }, "require-dev": { "yoast/phpunit-polyfills": "^1.1.1", - "automattic/jetpack-changelogger": "^4.2.8-alpha" + "automattic/jetpack-changelogger": "^4.2.8" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 05d5c271..6c9514bf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "12ea11ead443710d5b99e3610c3dc2bd", + "content-hash": "e7e0389d1c68d53acd68e43c1c1b7c25", "packages": [ { "name": "automattic/jetpack-device-detection", - "version": "2.1.6-alpha.1730548010", + "version": "2.1.6", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "460f09d797ba050711d2bc3a813742d427a8660e" + "reference": "c72a31f2b64af82d772867bb29e7f0bb4a31cc79" }, "require": { "php": ">=7.0" }, "require-dev": { - "automattic/jetpack-changelogger": "^4.2.8-alpha", + "automattic/jetpack-changelogger": "^4.2.8", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { @@ -63,11 +63,11 @@ "packages-dev": [ { "name": "automattic/jetpack-changelogger", - "version": "4.2.8-alpha.1730548010", + "version": "4.2.8", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "5a9f6200e93a0a30cb7fda9795eb3add505e982d" + "reference": "fc6ca030d1a57b25a4cda9f337873b0e78fd445a" }, "require": { "php": ">=7.0", diff --git a/vendor/automattic/jetpack-device-detection/CHANGELOG.md b/vendor/automattic/jetpack-device-detection/CHANGELOG.md index effed61f..51cb7184 100644 --- a/vendor/automattic/jetpack-device-detection/CHANGELOG.md +++ b/vendor/automattic/jetpack-device-detection/CHANGELOG.md @@ -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). -## [2.1.6-alpha] - unreleased - -This is an alpha version! The changes listed here are not final. - +## [2.1.6] - 2024-11-04 ### Added -- Enable test coverage. +- Enable test coverage. [#39961] ## [2.1.5] - 2024-09-16 ### Changed @@ -211,7 +208,7 @@ This is an alpha version! The changes listed here are not final. - Moving jetpack_is_mobile into a package -[2.1.6-alpha]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.5...v2.1.6-alpha +[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 [2.1.3]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.2...v2.1.3 diff --git a/vendor/automattic/jetpack-device-detection/composer.json b/vendor/automattic/jetpack-device-detection/composer.json index 6641482c..60c3fe8d 100644 --- a/vendor/automattic/jetpack-device-detection/composer.json +++ b/vendor/automattic/jetpack-device-detection/composer.json @@ -8,7 +8,7 @@ }, "require-dev": { "yoast/phpunit-polyfills": "^1.1.1", - "automattic/jetpack-changelogger": "^4.2.8-alpha" + "automattic/jetpack-changelogger": "^4.2.8" }, "suggest": { "automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package." diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 65c123c3..21bdf1bb 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,18 +2,18 @@ "packages": [ { "name": "automattic/jetpack-device-detection", - "version": "2.1.6-alpha.1730548010", - "version_normalized": "2.1.6.0-alpha1730548010", + "version": "2.1.6", + "version_normalized": "2.1.6.0", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "460f09d797ba050711d2bc3a813742d427a8660e" + "reference": "c72a31f2b64af82d772867bb29e7f0bb4a31cc79" }, "require": { "php": ">=7.0" }, "require-dev": { - "automattic/jetpack-changelogger": "^4.2.8-alpha", + "automattic/jetpack-changelogger": "^4.2.8", "yoast/phpunit-polyfills": "^1.1.1" }, "suggest": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 58fd90c9..a9be8b40 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -11,9 +11,9 @@ ), 'versions' => array( 'automattic/jetpack-device-detection' => array( - 'pretty_version' => '2.1.6-alpha.1730548010', - 'version' => '2.1.6.0-alpha1730548010', - 'reference' => '460f09d797ba050711d2bc3a813742d427a8660e', + 'pretty_version' => '2.1.6', + 'version' => '2.1.6.0', + 'reference' => 'c72a31f2b64af82d772867bb29e7f0bb4a31cc79', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-device-detection', 'aliases' => array(),