Merge pull request #3288 from woocommerce/feature/GOOWOO-383-genai-assets

Feature: Gen AI Assets (Phase 1)

Author: joemcgill

bin/GoogleAdsCleanupServices.php

@@ -26,7 +26,7 @@ class GoogleAdsCleanupServices {
 	 *
 	 * @var string
 	 */
-	protected $version = 'V20';
+	protected $version = 'V22';
 
 	/**
 	 * @var Event Composer event.
@@ -52,12 +52,11 @@ class GoogleAdsCleanupServices {
 	 * @var string[] List of Service to NOT remove even when usage is not found.
 	 */
 	protected $avoid_cleanup = [
-		// Some methods like `ResourceNames::forGeoTargetConstant` are changed to use
-		// `BatchJobServiceClient` class instead of `GoogleAdsServiceClient` when
-		// upgrading from v18 to v20, so we need to keep this service. See:
-		// - https://github.com/googleads/google-ads-php/blob/v28.0.0/src/Google/Ads/GoogleAds/Util/V18/ResourceNames.php#L1704-L1710
+		// ConversionValueRuleService is now used in `ResourceNames::forGeoTargetConstant` in V22.
+		// instead of the previous BatchJobServiceClient. See:
 		// - https://github.com/googleads/google-ads-php/blob/v28.0.0/src/Google/Ads/GoogleAds/Util/V20/ResourceNames.php#L1433-L1439
-		'BatchJob',
+		// - https://github.com/googleads/google-ads-php/blob/v31.1.0/src/Google/Ads/GoogleAds/Util/V22/ResourceNames.php#L1457-L1463
+		'ConversionValueRule',
 	];
 
 	/**

composer.json

@@ -9,7 +9,7 @@
 		"ext-json": "*",
 		"google/apiclient": "^2.16",
 		"google/apiclient-services": "^0.350.0",
-		"googleads/google-ads-php": "dev-legacy-v31.0.1",
+		"googleads/google-ads-php": "dev-legacy-v31.1.0",
 		"league/container": "^4.2",
 		"league/iso3166": "^4.1",
 		"phpseclib/bcmath_compat": "^2.0",
@@ -60,7 +60,7 @@
 			"Google\\Task\\Composer::cleanup",
 			"Automattic\\WooCommerce\\GoogleListingsAndAds\\Util\\SymfonyPolyfillCleanup::remove",
 			"Automattic\\WooCommerce\\GoogleListingsAndAds\\Util\\GoogleAdsCleanupServices::remove",
-			"composer run-script remove-google-ads-api-version-support -- 18 19 21",
+			"composer run-script remove-google-ads-api-version-support -- 18 19 20 21",
 			"php ./bin/prefix-vendor-namespace.php",
 			"bash ./bin/cleanup-vendor-files.sh",
 			"composer dump-autoload"