From 21bf16fcf2a6bf73de577975efd041a26c019663 Mon Sep 17 00:00:00 2001 From: anomiex Date: Tue, 9 Apr 2024 15:41:05 +0000 Subject: [PATCH] Backport mu-wpcom-plugin 2.1.14, jetpack 13.4-a.1 Changes (#36792) Changelog and readme.txt edits. Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/8618336925 --- composer.json | 2 +- composer.lock | 8 ++++---- .../automattic/jetpack-device-detection/CHANGELOG.md | 11 ++++------- vendor/composer/installed.json | 6 +++--- vendor/composer/installed.php | 6 +++--- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 0ba95a8a..23eba98c 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "type": "wordpress-plugin", "license": "GPL-2.0-or-later", "require": { - "automattic/jetpack-device-detection": "^2.1.3-alpha" + "automattic/jetpack-device-detection": "^2.1.3" }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", diff --git a/composer.lock b/composer.lock index 7e4ceaa1..beaf6a7d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,15 +4,15 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a1d6842518ce79e8e11cd2b16fcc398f", + "content-hash": "2e7dc425d4b6322aceedca8c28db78bf", "packages": [ { "name": "automattic/jetpack-device-detection", - "version": "2.1.3-alpha.1712563319", + "version": "2.1.3", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "feab2b6ee41ad0af932325e1360912aa1c9fe549" + "reference": "b9e42ec4bcd6972c820c430354226f624579a420" }, "require": { "php": ">=7.0" @@ -64,7 +64,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "11081b02d6141ec9b818f60e53107d41edda538c" + "reference": "8b4ad7964ce7bd5e0acc5b824e5b838e912eb58d" }, "require": { "php": ">=7.0", diff --git a/vendor/automattic/jetpack-device-detection/CHANGELOG.md b/vendor/automattic/jetpack-device-detection/CHANGELOG.md index 7e478bd8..1adce0dc 100644 --- a/vendor/automattic/jetpack-device-detection/CHANGELOG.md +++ b/vendor/automattic/jetpack-device-detection/CHANGELOG.md @@ -5,15 +5,12 @@ 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.3-alpha] - unreleased - -This is an alpha version! The changes listed here are not final. - +## [2.1.3] - 2024-04-08 ### Added -- Added functionality for extracting the browser and desktop platform from a user agent +- Added functionality for extracting the browser and desktop platform from a user agent. [#36568] ### Changed -- Add new bots +- Add new bots. [#36477] ## [2.1.2] - 2024-03-18 ### Changed @@ -199,7 +196,7 @@ This is an alpha version! The changes listed here are not final. - Moving jetpack_is_mobile into a package -[2.1.3-alpha]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.2...v2.1.3-alpha +[2.1.3]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.2...v2.1.3 [2.1.2]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.1...v2.1.2 [2.1.1]: https://github.com/Automattic/jetpack-device-detection/compare/v2.1.0...v2.1.1 [2.1.0]: https://github.com/Automattic/jetpack-device-detection/compare/v2.0.1...v2.1.0 diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index f0110a2c..edb3a380 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,12 +2,12 @@ "packages": [ { "name": "automattic/jetpack-device-detection", - "version": "2.1.3-alpha.1712563319", - "version_normalized": "2.1.3.0-alpha1712563319", + "version": "2.1.3", + "version_normalized": "2.1.3.0", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection", - "reference": "feab2b6ee41ad0af932325e1360912aa1c9fe549" + "reference": "b9e42ec4bcd6972c820c430354226f624579a420" }, "require": { "php": ">=7.0" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index e0f62f4e..2fd8aa3d 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.3-alpha.1712563319', - 'version' => '2.1.3.0-alpha1712563319', - 'reference' => 'feab2b6ee41ad0af932325e1360912aa1c9fe549', + 'pretty_version' => '2.1.3', + 'version' => '2.1.3.0', + 'reference' => 'b9e42ec4bcd6972c820c430354226f624579a420', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-device-detection', 'aliases' => array(),