Merge pull request #2300 from woocommerce/trunk

Release 2.6.1 - Merge `trunk` to `develop`

changelog.txt

@@ -1,5 +1,12 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.6.1 - 2024-03-05 =
+* Add - Consider `ga_gtag_enabled=yes` for  WCGAI >= 2.
+* Add - Google Analytics consent mode support.
+* Add - Support for Google Analytics for WooCommerce version 2.0.0 and above.
+* Dev - Avoid the test-data plugin occasionally missing in the E2E test environment.
+* Fix - Improve WordPress.com account handling.
+
 = 2.6.0 - 2024-02-27 =
 * Add - Support the new product editor (Product Block Editor).
 * Dev - Fix the compatibility issue in starting E2E test environment due to the default charset change in MariaDB v11.3.1.

google-listings-and-ads.php

@@ -3,7 +3,7 @@
  * Plugin Name: Google Listings and Ads
  * 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.6.0
+ * Version: 2.6.1
  * Author: WooCommerce
  * Author URI: https://woo.com/
  * Text Domain: google-listings-and-ads
@@ -30,7 +30,7 @@
 
 defined( 'ABSPATH' ) || exit;
 
-define( 'WC_GLA_VERSION', '2.6.0' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.6.1' ); // WRCS: DEFINED_VERSION.
 define( 'WC_GLA_MIN_PHP_VER', '7.4' );
 define( 'WC_GLA_MIN_WC_VER', '6.9' );
 

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "google-listings-and-ads",
 	"title": "Google Listings and Ads",
-	"version": "2.6.0",
+	"version": "2.6.1",
 	"description": "google-listings-and-ads",
 	"author": "Automattic",
 	"license": "GPL-3.0-or-later",

readme.txt

@@ -5,7 +5,7 @@ Requires at least: 5.9
 Tested up to: 6.4
 Requires PHP: 7.4
 Requires PHP Architecture: 64 Bits
-Stable tag: 2.6.0
+Stable tag: 2.6.1
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -111,6 +111,13 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 
 == Changelog ==
 
+= 2.6.1 - 2024-03-05 =
+* Add - Consider `ga_gtag_enabled=yes` for  WCGAI >= 2.
+* Add - Google Analytics consent mode support.
+* Add - Support for Google Analytics for WooCommerce version 2.0.0 and above.
+* Dev - Avoid the test-data plugin occasionally missing in the E2E test environment.
+* Fix - Improve WordPress.com account handling.
+
 = 2.6.0 - 2024-02-27 =
 * Add - Support the new product editor (Product Block Editor).
 * Dev - Fix the compatibility issue in starting E2E test environment due to the default charset change in MariaDB v11.3.1.
@@ -119,11 +126,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 = 2.5.18 - 2024-02-20 =
 * Fix - Prevent product queries by IDs if no arguments are supplied.
 
-= 2.5.17 - 2024-02-07 =
-* Dev - Add manual QIT workflow.
-* Dev - Upload coverage report for JS unit tests to codecov.
-* Fix - Only sync selected categories as product type.
-* Fix - Prevent notifications from sending request to Google API when disconnected.
-* Tweak - WC 8.6 compatibility.
-
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).