Merge pull request #2710 from woocommerce/trunk

Release 2.9.1 - Merge `trunk` to `develop`
woocommerce · Dec 3, 2024 · 30de949 · 30de949
2 parents 155dc31 + a19ae25
commit 30de949
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 266 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,11 @@
 *** Google for WooCommerce Changelog ***
 
+= 2.9.1 - 2024-12-03 =
+* Fix - Make the tab navigation tabs wrap when the screen narrows.
+* Fix - Prevent translations from being called early.
+* Fix - The initial values of the form on free listings editing page may be empty.
+* Update - New shipping settings.
+
 = 2.9.0 - 2024-11-26 =
 * Add - Add GTIN Migration Job.
 * Add - Banner for GTIN MIgration.

diff --git a/google-listings-and-ads.php b/google-listings-and-ads.php
@@ -3,7 +3,7 @@
  * Plugin Name: Google for WooCommerce
  * Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
  * Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
- * Version: 2.9.0
+ * Version: 2.9.1
  * Author: WooCommerce
  * Author URI: https://woocommerce.com/
  * Text Domain: google-listings-and-ads
@@ -30,7 +30,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.9.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.9.1' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '6.9' );
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "google-listings-and-ads",
 	"title": "Google for WooCommerce",
-	"version": "2.9.0",
+	"version": "2.9.1",
 	"description": "Google for WooCommerce",
 	"author": "Automattic",
 	"license": "GPL-3.0-or-later",

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Requires at least: 5.9
 Tested up to: 6.7
 Requires PHP: 7.4
 Requires PHP Architecture: 64 Bits
-Stable tag: 2.9.0
+Stable tag: 2.9.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -140,6 +140,12 @@ To allow your products to appear in all relevant locations, make sure you’ve c
 
 == Changelog ==
 
+= 2.9.1 - 2024-12-03 =
+* Fix - Make the tab navigation tabs wrap when the screen narrows.
+* Fix - Prevent translations from being called early.
+* Fix - The initial values of the form on free listings editing page may be empty.
+* Update - New shipping settings.
+
 = 2.9.0 - 2024-11-26 =
 * Add - Add GTIN Migration Job.
 * Add - Banner for GTIN MIgration.
@@ -193,9 +199,4 @@ To allow your products to appear in all relevant locations, make sure you’ve c
 * Tweak - WordPress 6.7 Compatibility: Adjust the layout of the radio control to align well with the extended content.
 * Tweak - WordPress 6.7 Compatibility: Avoid errors in the database where a TEXT type can't have a default value.
 
-= 2.8.6 - 2024-10-02 =
-* Dev - Fix missing blueprint dependency.
-* Tweak - Adjust WP Proxy Response to force the string type for the price fields.
-* Tweak - Logic for Delete notifications.
-
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).
diff --git a/src/DB/Migration/Migration20240813T1653383133.php b/src/DB/Migration/Migration20240813T1653383133.php
@@ -16,7 +16,7 @@
  *
  * @package Automattic\WooCommerce\GoogleListingsAndAds\DB\Migration
  *
- * @since x.x.x
+ * @since 2.9.1
  */
 class Migration20240813T1653383133 extends AbstractMigration {
 
@@ -43,7 +43,7 @@ public function __construct( \wpdb $wpdb, ShippingTimeTable $shipping_time_table
 	 * @return string A version number. For example: 1.4.1
 	 */
 	public function get_applicable_version(): string {
-		return 'x.x.x';
+		return '2.9.1';
 	}
 
 	/**

diff --git a/src/Hooks/README.md b/src/Hooks/README.md