From 643e4f656266500be3523de0fdf3d4e3ccd2a232 Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Wed, 30 Aug 2023 15:31:39 +0200 Subject: [PATCH] General: update WordPress requirements to WP 6.2 See #31638 This also reverts #32366 --- .github/files/generate-ci-matrix.php | 9 ++--- .github/files/setup-wordpress-env.sh | 5 --- .phpcs.config.xml | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/backup/composer.json | 2 +- projects/plugins/backup/jetpack-backup.php | 2 +- projects/plugins/backup/readme.txt | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/inspect/readme.txt | 40 +++++++++---------- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/jetpack/jetpack.php | 4 +- projects/plugins/jetpack/readme.txt | 4 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/migration/readme.txt | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/protect/readme.txt | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/search/readme.txt | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/social/composer.json | 2 +- projects/plugins/social/jetpack-social.php | 2 +- projects/plugins/social/readme.txt | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/starter-plugin/readme.txt | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/super-cache/readme.txt | 2 +- .../changelog/update-wp-requirements-62 | 4 ++ projects/plugins/videopress/readme.txt | 4 +- tools/cli/commands/generate.js | 2 +- 29 files changed, 82 insertions(+), 50 deletions(-) create mode 100644 projects/plugins/backup/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/inspect/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/jetpack/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/migration/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/protect/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/search/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/social/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/starter-plugin/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/super-cache/changelog/update-wp-requirements-62 create mode 100644 projects/plugins/videopress/changelog/update-wp-requirements-62 diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php index 6175dc76c22b4..63bfb0618067e 100755 --- a/.github/files/generate-ci-matrix.php +++ b/.github/files/generate-ci-matrix.php @@ -74,11 +74,8 @@ 'timeout' => 20, // 2022-01-25: 5.6 tests have started timing out at 15 minutes. Previously: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 trunk run, ~5.5-6 for 7.x and 8.0. ); -foreach ( array( 'previous', 'trunk', 'special' ) as $wp ) { - $phpver = $versions['PHP_VERSION']; - if ( $wp === 'special' ) { - $phpver = '8.0'; // WordPress 6.1 is not ready for PHP 8.1+. - } +foreach ( array( 'previous', 'trunk' ) as $wp ) { + $phpver = $versions['PHP_VERSION']; $matrix[] = array( 'name' => "PHP tests: PHP {$phpver} WP $wp", 'script' => 'test-php', @@ -206,7 +203,7 @@ function join_or( $vals ) { } // Only specific values allowed for `wp`. - $valid_wp = array( 'latest', 'previous', 'trunk', 'special', 'none' ); + $valid_wp = array( 'latest', 'previous', 'trunk', 'none' ); if ( ! in_array( $m['wp'], $valid_wp, true ) ) { $valid_wp = join_or( array_map( diff --git a/.github/files/setup-wordpress-env.sh b/.github/files/setup-wordpress-env.sh index 74c875f6e9ea9..ff9bedddb6a85 100755 --- a/.github/files/setup-wordpress-env.sh +++ b/.github/files/setup-wordpress-env.sh @@ -42,11 +42,6 @@ case "$WP_BRANCH" in # we've dropped the old 'previous' but WP hasn't actually released the new 'latest' TAG=6.2 ;; - special) - # This is a special case for testing WP 6.1 as well as 6.2 in the interim between Jetpack 12.4 and WC US on 25th of August, 2023. - # TODO: Remove this after Jetpack 12.5 is released, more here: pdWQjU-r3-p2 - TAG=6.1 - ;; *) echo "Unrecognized value for WP_BRANCH: $WP_BRANCH" >&2 exit 1 diff --git a/.phpcs.config.xml b/.phpcs.config.xml index 18f979dcf9e34..fdd5fe831bdf6 100644 --- a/.phpcs.config.xml +++ b/.phpcs.config.xml @@ -2,7 +2,7 @@ - + diff --git a/projects/plugins/backup/changelog/update-wp-requirements-62 b/projects/plugins/backup/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/backup/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/backup/composer.json b/projects/plugins/backup/composer.json index 309fbdbb16dd2..7ba96653d74e9 100644 --- a/projects/plugins/backup/composer.json +++ b/projects/plugins/backup/composer.json @@ -34,7 +34,7 @@ "minimum-stability": "dev", "prefer-stable": true, "config": { - "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ2_1", + "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ2_2_alpha", "allow-plugins": { "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true diff --git a/projects/plugins/backup/jetpack-backup.php b/projects/plugins/backup/jetpack-backup.php index 297685bf0897a..36a78f9a376d6 100644 --- a/projects/plugins/backup/jetpack-backup.php +++ b/projects/plugins/backup/jetpack-backup.php @@ -4,7 +4,7 @@ * Plugin Name: Jetpack VaultPress Backup * Plugin URI: https://jetpack.com/jetpack-backup * Description: Easily restore or download a backup of your site from a specific moment in time. - * Version: 2.1 + * Version: 2.2-alpha * Author: Automattic - Jetpack Backup team * Author URI: https://jetpack.com/ * License: GPLv2 or later diff --git a/projects/plugins/backup/readme.txt b/projects/plugins/backup/readme.txt index 0b6ebfb7f6c7f..8c0dd47dbd6ca 100644 --- a/projects/plugins/backup/readme.txt +++ b/projects/plugins/backup/readme.txt @@ -1,7 +1,7 @@ === Jetpack VaultPress Backup === Contributors: automattic, bjorsch, fgiannar, initsogar, jeherve, jwebbdev, kraftbj, macbre, samiff, sermitr, williamvianas Tags: jetpack, backup, restore -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 Stable tag: 2.1 diff --git a/projects/plugins/inspect/changelog/update-wp-requirements-62 b/projects/plugins/inspect/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/inspect/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/inspect/readme.txt b/projects/plugins/inspect/readme.txt index 10da8d79296f6..090419dd4cd1e 100644 --- a/projects/plugins/inspect/readme.txt +++ b/projects/plugins/inspect/readme.txt @@ -1,7 +1,7 @@ === Jetpack inspect === Contributors: automattic, Tags: jetpack, stuff -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.2 Stable tag: 1.0.0-alpha @@ -11,19 +11,19 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html A debugging plugin to inspect Jetpack interactions with WordPress.com. == Description == - + Longer description of the plugin. - + == Installation == - + Installation instructions go here. - + == Frequently Asked Questions == - + = A question that someone might have = - + An answer to that question. - + == Screenshots == 1. This screen shot description corresponds to screenshot-1.(png|jpg|jpeg|gif). Note that the screenshot is taken from @@ -31,38 +31,38 @@ the /assets directory or the directory that contains the stable readme.txt (tags directory take precedence. For example, `/assets/screenshot-1.png` would win over `/tags/4.3/screenshot-1.png` (or jpg, jpeg, gif). 2. This is the second screen shot - + == Changelog == - + == Arbitrary section == - + You may provide arbitrary sections, in the same format as the ones above. This may be of use for extremely complicated plugins where more information needs to be conveyed that doesn't fit into the categories of "description" or "installation." Arbitrary sections will be shown below the built-in sections outlined above. - + == A brief Markdown Example == - + Ordered list: - + 1. Some feature 1. Another feature 1. Something else about the plugin - + Unordered list: - + * something * something else * third thing - + Here's a link to [WordPress](https://wordpress.org/ "Your favorite software") and one to [Markdown's Syntax Documentation][markdown syntax]. Titles are optional, naturally. - + [markdown syntax]: http://daringfireball.net/projects/markdown/syntax "Markdown is what the parser uses to process much of the readme file" - + Markdown uses email style notation for blockquotes and I've been told: > Asterisks for *emphasis*. Double it up for **strong**. - + `` diff --git a/projects/plugins/jetpack/changelog/update-wp-requirements-62 b/projects/plugins/jetpack/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..d02cc8b873298 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: compat + +General: Jetpack now requires WordPress version 6.2. diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php index f61ef52b4d733..7bfbd81a28719 100644 --- a/projects/plugins/jetpack/jetpack.php +++ b/projects/plugins/jetpack/jetpack.php @@ -8,7 +8,7 @@ * Author URI: https://jetpack.com * License: GPL2+ * Text Domain: jetpack - * Requires at least: 6.1 + * Requires at least: 6.2 * Requires PHP: 5.6 * * @package automattic/jetpack @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -define( 'JETPACK__MINIMUM_WP_VERSION', '6.1' ); +define( 'JETPACK__MINIMUM_WP_VERSION', '6.2' ); define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' ); define( 'JETPACK__VERSION', '12.6-a.2' ); diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt index d6c2fb0058e46..c9ad4785174e8 100644 --- a/projects/plugins/jetpack/readme.txt +++ b/projects/plugins/jetpack/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, adamkheckler, adrianmoldovanwp, aduth, akirk, allendav, alternatekev, andy, annamcphee, annezazu, apeatling, arcangelini, azaozz, batmoo, barry, beaulebens, bindlegirl, biskobe, blobaugh, bjorsch, brbrr, cainm, cena, cfinke, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, davoraltman, daniloercoli, delawski, designsimply, dllh, drawmyface, dsmart, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, jblz, jasmussen, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lschuyler, macmanx, martinremy, matt, matveb, mattwiebe, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, mikeyarce, mkaz, nancythanki, nickmomrik, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, ryancowles, richardmuscat, richardmtl, robertbpugh, roccotripaldi, samhotchkiss, samiff, scarstocea, scottsweb, sdixon194, sdquirk, sermitr, simison, stephdau, tmoorewp, tyxla, Viper007Bond, westi, wpkaren, yoavf, zinigor Tags: Security, backup, Woo, malware, scan, spam, CDN, search, social Stable tag: 12.5 -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 @@ -374,4 +374,4 @@ Jetpack Backup can do a full website migration to a new host, migrate theme file -------- -[See the previous changelogs here](https://github.com/Automattic/jetpack/blob/trunk/projects/plugins/jetpack/CHANGELOG.md#changelog) \ No newline at end of file +[See the previous changelogs here](https://github.com/Automattic/jetpack/blob/trunk/projects/plugins/jetpack/CHANGELOG.md#changelog) diff --git a/projects/plugins/migration/changelog/update-wp-requirements-62 b/projects/plugins/migration/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/migration/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/migration/readme.txt b/projects/plugins/migration/readme.txt index b95f0ed787ec3..2f3d9c6de0f15 100644 --- a/projects/plugins/migration/readme.txt +++ b/projects/plugins/migration/readme.txt @@ -1,7 +1,7 @@ === Move to WordPress.com === Contributors: automattic Tags: migrate, migration, backup, restore, transfer, move, copy, wordpress.com, automattic, import, importer, hosting -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 Stable tag: 0.1.0 diff --git a/projects/plugins/protect/changelog/update-wp-requirements-62 b/projects/plugins/protect/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/protect/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/protect/readme.txt b/projects/plugins/protect/readme.txt index a91c068c16b20..fa3565fa6d481 100644 --- a/projects/plugins/protect/readme.txt +++ b/projects/plugins/protect/readme.txt @@ -1,7 +1,7 @@ === Jetpack Protect === Contributors: automattic, retrofox, leogermani, renatoagds, bjorsch, ebinnion, fgiannar, zinigor, miguelxavierpenha, dsmart, jeherve, manzoorwanijk, njweller, oskosk, samiff, siddarthan, wpkaren, arsihasi, kraftbj, kev, sermitr, kangzj, pabline, dkmyta Tags: jetpack, protect, security, malware, scan -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 Stable tag: 1.4.0 diff --git a/projects/plugins/search/changelog/update-wp-requirements-62 b/projects/plugins/search/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/search/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/search/readme.txt b/projects/plugins/search/readme.txt index 471f5c4867125..bb8b243bb2d8e 100644 --- a/projects/plugins/search/readme.txt +++ b/projects/plugins/search/readme.txt @@ -1,7 +1,7 @@ === Jetpack Search === Contributors: automattic, annamcphee, bluefuton, kangzj, jsnmoon, robfelty, gibrown, trakos, dognose24, a8ck3n Tags: search, filter, woocommerce search, ajax search, product search, free cloud-based search -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 Stable tag: 1.4.0 diff --git a/projects/plugins/social/changelog/update-wp-requirements-62 b/projects/plugins/social/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/social/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json index 09308a8447472..18e1d1847e356 100644 --- a/projects/plugins/social/composer.json +++ b/projects/plugins/social/composer.json @@ -81,6 +81,6 @@ "automattic/jetpack-autoloader": true, "automattic/jetpack-composer-plugin": true }, - "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ2_2_0" + "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ2_2_1_alpha" } } diff --git a/projects/plugins/social/jetpack-social.php b/projects/plugins/social/jetpack-social.php index 9b818d48baa36..0a2a70399867b 100644 --- a/projects/plugins/social/jetpack-social.php +++ b/projects/plugins/social/jetpack-social.php @@ -4,7 +4,7 @@ * Plugin Name: Jetpack Social * Plugin URI: https://wordpress.org/plugins/jetpack-social * Description: Share your site’s posts on several social media networks automatically when you publish a new post. - * Version: 2.2.0 + * Version: 2.2.1-alpha * Author: Automattic - Jetpack Social team * Author URI: https://jetpack.com/social/ * License: GPLv2 or later diff --git a/projects/plugins/social/readme.txt b/projects/plugins/social/readme.txt index 44c489f803469..318218fc03ef1 100644 --- a/projects/plugins/social/readme.txt +++ b/projects/plugins/social/readme.txt @@ -1,7 +1,7 @@ === Jetpack Social === Contributors: automattic, pabline, siddarthan, gmjuhasz, manzoorwanijk, danielpost Tags: social-media, publicize, social-media-manager, social-networking, social marketing, social, social share, social media scheduling, social media automation, auto post, auto- publish, social share -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 Stable tag: 2.2.0 diff --git a/projects/plugins/starter-plugin/changelog/update-wp-requirements-62 b/projects/plugins/starter-plugin/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/starter-plugin/readme.txt b/projects/plugins/starter-plugin/readme.txt index d333f366ab412..702b9dec14d31 100644 --- a/projects/plugins/starter-plugin/readme.txt +++ b/projects/plugins/starter-plugin/readme.txt @@ -1,7 +1,7 @@ === Jetpack Starter Plugin === Contributors: automattic, Tags: jetpack, stuff -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 Stable tag: 0.1.0-alpha diff --git a/projects/plugins/super-cache/changelog/update-wp-requirements-62 b/projects/plugins/super-cache/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/super-cache/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/super-cache/readme.txt b/projects/plugins/super-cache/readme.txt index 5c8df26e70bec..259d5ba91b419 100644 --- a/projects/plugins/super-cache/readme.txt +++ b/projects/plugins/super-cache/readme.txt @@ -1,7 +1,7 @@ === WP Super Cache === Contributors: donncha, automattic, adnan007, dilirity, mikemayhem3030, pyronaur, thingalon Tags: performance, caching, wp-cache, wp-super-cache, cache -Requires at least: 6.1 +Requires at least: 6.2 Requires PHP: 5.6 Tested up to: 6.3 Stable tag: 1.10.0 diff --git a/projects/plugins/videopress/changelog/update-wp-requirements-62 b/projects/plugins/videopress/changelog/update-wp-requirements-62 new file mode 100644 index 0000000000000..589c66cd92f9f --- /dev/null +++ b/projects/plugins/videopress/changelog/update-wp-requirements-62 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +General: update WordPress version requirements to WordPress 6.2. diff --git a/projects/plugins/videopress/readme.txt b/projects/plugins/videopress/readme.txt index d5eb4a1bb4f9a..f4aca46c35b91 100644 --- a/projects/plugins/videopress/readme.txt +++ b/projects/plugins/videopress/readme.txt @@ -2,7 +2,7 @@ Contributors: automattic, retrofox, oskosk, thehenridev, renatoagds, lhkowalski, nunyvega, leogermani Tags: video, video-hosting, video-player, cdn, vimeo, youtube, video-streaming, mobile-video, jetpack -Requires at least: 6.1 +Requires at least: 6.2 Tested up to: 6.3 Stable tag: 1.5 Requires PHP: 5.6 @@ -39,7 +39,7 @@ With the [Jetpack VideoPress Block](https://jetpack.com/support/jetpack-videopre * Optimized for mobile – Switch between mobile and desktop without missing a beat. * Picture-in-picture – Pop out the video from the web browser for easier viewing. * Unlimited Logins – Work with a team? We don’t charge per seat, so everyone that works on your site can have their own login. -* High-Resolution Videos Up to 4K – Watch crisp images on any display and screen size. We’ve added video display for 1440p, 60 FPS, and full 4K resolution. +* High-Resolution Videos Up to 4K – Watch crisp images on any display and screen size. We’ve added video display for 1440p, 60 FPS, and full 4K resolution. * Ad-free video - Keep the spotlight on your content, not on ads you can’t control. = Your one-stop solution for video management = diff --git a/tools/cli/commands/generate.js b/tools/cli/commands/generate.js index 829fa0a812d9e..9b428dfcb37b4 100644 --- a/tools/cli/commands/generate.js +++ b/tools/cli/commands/generate.js @@ -750,7 +750,7 @@ function createReadMeTxt( answers ) { `=== Jetpack ${ answers.name } ===\n` + 'Contributors: automattic,\n' + 'Tags: jetpack, stuff\n' + - 'Requires at least: 6.1\n' + + 'Requires at least: 6.2\n' + 'Requires PHP: 5.6\n' + 'Tested up to: 6.3\n' + `Stable tag: ${ answers.version }\n` +