Skip to content

Commit

Permalink
Backport jetpack 14.0-beta Changes (#40024)
Browse files Browse the repository at this point in the history
* 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@a7dc7da
  • Loading branch information
tbradsha authored and matticbot committed Nov 4, 2024
1 parent 6a5108e commit 73b428d
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 22 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-device-detection/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).

## [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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-device-detection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down

0 comments on commit 73b428d

Please sign in to comment.