Merge pull request #2017 from woocommerce/trunk

Release 2.5.0 - Merge trunk into develop
woocommerce · Jul 18, 2023 · 7c56147 · 7c56147
2 parents df49f81 + c641f14
commit 7c56147
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,9 @@
 *** WooCommerce Google Listings and Ads Changelog ***
 
+= 2.5.0 - 2023-07-18 =
+* Tweak - Add Tip with information with Campaign assets are imported.
+* Tweak - Provide more detailed error reasons when unable to complete site verification for the Google Merchant Center account being connected in the onboarding flow.
+
 = 2.4.11 - 2023-07-11 =
 * Add - Client name and plugin version to requests.
 * Dev - Enable unit testing for PHP 8.1.

diff --git a/google-listings-and-ads.php b/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.4.11
+ * Version: 2.5.0
  * 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.4.11' ); // WRCS: DEFINED_VERSION.
+define( 'WC_GLA_VERSION', '2.5.0' ); // 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 Listings and Ads",
-	"version": "2.4.11",
+	"version": "2.5.0",
 	"description": "google-listings-and-ads",
 	"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.2
 Requires PHP: 7.4
 Requires PHP Architecture: 64 Bits
-Stable tag: 2.4.11
+Stable tag: 2.5.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -111,6 +111,10 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 
 == Changelog ==
 
+= 2.5.0 - 2023-07-18 =
+* Tweak - Add Tip with information with Campaign assets are imported.
+* Tweak - Provide more detailed error reasons when unable to complete site verification for the Google Merchant Center account being connected in the onboarding flow.
+
 = 2.4.11 - 2023-07-11 =
 * Add - Client name and plugin version to requests.
 * Dev - Enable unit testing for PHP 8.1.
@@ -129,7 +133,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
 = 2.4.10 - 2023-06-13 =
 * Tweak - WC 7.8 compatibility.
 
-= 2.4.9 - 2023-06-08 =
-* Fix - Prefix psr/http-client package.
-
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).