Skip to content

Commit 424d157

Browse files
devchasdevchas
authored
Merge pull request #674 from googleads/release-v12_0-a70d95e02280630924ac
Changes for release v12_0.
2 parents 0cf3cb6 + ac1791b commit 424d157

9,323 files changed

Lines changed: 2431846 additions & 284334 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎buildSrc/src/main/groovy/com.google.api-ads.java-conventions.gradle‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ tasks.withType(JavaCompile) {
142142
dependencies {
143143
api 'com.google.api:gax'
144144
api 'com.google.api:gax-grpc'
145-
api 'com.google.protobuf:protobuf-java'
145+
// Generated code requires at least 3.19.6 of protobuf-java.
146+
api 'com.google.protobuf:protobuf-java:3.19.6'
147+
api 'com.google.protobuf:protobuf-java-util:3.19.6'
146148
api 'io.grpc:grpc-stub'
147149
api 'io.grpc:grpc-protobuf'
148150
api 'com.google.auth:google-auth-library-oauth2-http:1.5.3'
@@ -264,14 +266,6 @@ class ListExamplesTask extends DefaultTask {
264266
private static final String MAIN_EXAMPLES_BASE_DIRECTORY =
265267
'src/main/java/com/google/ads/googleads/examples/'
266268

267-
// The base directory containing all examples.
268-
private static final String MIGRATION_EXAMPLES_BASE_DIRECTORY =
269-
'../google-ads-migration-examples/src/main/java/com/google/ads/googleads/migration/'
270-
271-
// The name of the package with the migration examples (currently only one
272-
// such package exists).
273-
private static final String MIGRATION_PACKAGE_NAME = 'campaignmanagement'
274-
275269
// A list of subdirectories to exclude from the printout.
276270
@Input
277271
List<String> directoriesToExclude = ['utils']
@@ -364,18 +358,10 @@ class ListExamplesTask extends DefaultTask {
364358
void exec() {
365359
String mainExamplesDirectory = subdirectory ?
366360
MAIN_EXAMPLES_BASE_DIRECTORY + subdirectory + '/' : MAIN_EXAMPLES_BASE_DIRECTORY
367-
String migrationExamplesDirectory = subdirectory ?
368-
MIGRATION_EXAMPLES_BASE_DIRECTORY + subdirectory + '/' : MIGRATION_EXAMPLES_BASE_DIRECTORY
369361
int count = 0
370362

371363
count += traverseDirectory(mainExamplesDirectory, count)
372364

373-
// Only print the migration examples if printing all examples or examples
374-
// with the campaignmanagement package name.
375-
if (!subdirectory || subdirectory == MIGRATION_PACKAGE_NAME) {
376-
count += traverseDirectory(migrationExamplesDirectory, count)
377-
}
378-
379365
println "\nTotal examples: $count"
380366
}
381367
}

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/ApproveMerchantCenterLink.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
2121
import com.google.ads.googleads.lib.utils.FieldMasks;
22-
import com.google.ads.googleads.v11.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
23-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
24-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
25-
import com.google.ads.googleads.v11.resources.MerchantCenterLink;
26-
import com.google.ads.googleads.v11.services.ListMerchantCenterLinksRequest;
27-
import com.google.ads.googleads.v11.services.ListMerchantCenterLinksResponse;
28-
import com.google.ads.googleads.v11.services.MerchantCenterLinkOperation;
29-
import com.google.ads.googleads.v11.services.MerchantCenterLinkServiceClient;
30-
import com.google.ads.googleads.v11.services.MutateMerchantCenterLinkResponse;
31-
import com.google.ads.googleads.v11.services.MutateMerchantCenterLinkResult;
22+
import com.google.ads.googleads.v12.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
23+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
24+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
25+
import com.google.ads.googleads.v12.resources.MerchantCenterLink;
26+
import com.google.ads.googleads.v12.services.ListMerchantCenterLinksRequest;
27+
import com.google.ads.googleads.v12.services.ListMerchantCenterLinksResponse;
28+
import com.google.ads.googleads.v12.services.MerchantCenterLinkOperation;
29+
import com.google.ads.googleads.v12.services.MerchantCenterLinkServiceClient;
30+
import com.google.ads.googleads.v12.services.MutateMerchantCenterLinkResponse;
31+
import com.google.ads.googleads.v12.services.MutateMerchantCenterLinkResult;
3232
import java.io.FileNotFoundException;
3333
import java.io.IOException;
3434

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/CreateCustomer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v11.resources.Customer;
24-
import com.google.ads.googleads.v11.services.CreateCustomerClientResponse;
25-
import com.google.ads.googleads.v11.services.CustomerServiceClient;
21+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v12.resources.Customer;
24+
import com.google.ads.googleads.v12.services.CreateCustomerClientResponse;
25+
import com.google.ads.googleads.v12.services.CustomerServiceClient;
2626
import java.io.FileNotFoundException;
2727
import java.io.IOException;
2828
import java.time.ZonedDateTime;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetAccountHierarchy.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v11.resources.CustomerClient;
24-
import com.google.ads.googleads.v11.resources.CustomerName;
25-
import com.google.ads.googleads.v11.services.CustomerServiceClient;
26-
import com.google.ads.googleads.v11.services.GoogleAdsRow;
27-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient;
28-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient.SearchPagedResponse;
29-
import com.google.ads.googleads.v11.services.ListAccessibleCustomersRequest;
30-
import com.google.ads.googleads.v11.services.ListAccessibleCustomersResponse;
31-
import com.google.ads.googleads.v11.services.SearchGoogleAdsRequest;
21+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v12.resources.CustomerClient;
24+
import com.google.ads.googleads.v12.resources.CustomerName;
25+
import com.google.ads.googleads.v12.services.CustomerServiceClient;
26+
import com.google.ads.googleads.v12.services.GoogleAdsRow;
27+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
28+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
29+
import com.google.ads.googleads.v12.services.ListAccessibleCustomersRequest;
30+
import com.google.ads.googleads.v12.services.ListAccessibleCustomersResponse;
31+
import com.google.ads.googleads.v12.services.SearchGoogleAdsRequest;
3232
import com.google.common.base.Strings;
3333
import com.google.common.collect.ArrayListMultimap;
3434
import com.google.common.collect.Multimap;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetAccountInformation.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v11.resources.Customer;
24-
import com.google.ads.googleads.v11.services.GoogleAdsRow;
25-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient;
26-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v12.resources.Customer;
24+
import com.google.ads.googleads.v12.services.GoogleAdsRow;
25+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
26+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
2727
import java.io.FileNotFoundException;
2828
import java.io.IOException;
2929

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetChangeDetails.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
2121
import com.google.ads.googleads.lib.utils.FieldMasks;
22-
import com.google.ads.googleads.v11.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
23-
import com.google.ads.googleads.v11.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
24-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
25-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
26-
import com.google.ads.googleads.v11.resources.ChangeEvent;
27-
import com.google.ads.googleads.v11.resources.ChangeEvent.ChangedResource;
28-
import com.google.ads.googleads.v11.services.GoogleAdsRow;
29-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient;
30-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient.SearchPagedResponse;
22+
import com.google.ads.googleads.v12.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
23+
import com.google.ads.googleads.v12.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
24+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
25+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
26+
import com.google.ads.googleads.v12.resources.ChangeEvent;
27+
import com.google.ads.googleads.v12.resources.ChangeEvent.ChangedResource;
28+
import com.google.ads.googleads.v12.services.GoogleAdsRow;
29+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
30+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
3131
import com.google.protobuf.Message;
3232
import java.io.FileNotFoundException;
3333
import java.io.IOException;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetChangeSummary.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v11.resources.ChangeStatus;
24-
import com.google.ads.googleads.v11.services.GoogleAdsRow;
25-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient;
26-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v12.resources.ChangeStatus;
24+
import com.google.ads.googleads.v12.services.GoogleAdsRow;
25+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
26+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
2727
import java.io.FileNotFoundException;
2828
import java.io.IOException;
2929
import java.util.Optional;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetPendingInvitations.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v11.services.GoogleAdsRow;
24-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient;
25-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v12.services.GoogleAdsRow;
24+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
25+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
2626
import java.io.FileNotFoundException;
2727
import java.io.IOException;
2828

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/InviteUserWithAccessRole.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v11.enums.AccessRoleEnum.AccessRole;
22-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
23-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
24-
import com.google.ads.googleads.v11.resources.CustomerUserAccessInvitation;
25-
import com.google.ads.googleads.v11.services.CustomerUserAccessInvitationOperation;
26-
import com.google.ads.googleads.v11.services.CustomerUserAccessInvitationServiceClient;
27-
import com.google.ads.googleads.v11.services.MutateCustomerUserAccessInvitationResponse;
21+
import com.google.ads.googleads.v12.enums.AccessRoleEnum.AccessRole;
22+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
23+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
24+
import com.google.ads.googleads.v12.resources.CustomerUserAccessInvitation;
25+
import com.google.ads.googleads.v12.services.CustomerUserAccessInvitationOperation;
26+
import com.google.ads.googleads.v12.services.CustomerUserAccessInvitationServiceClient;
27+
import com.google.ads.googleads.v12.services.MutateCustomerUserAccessInvitationResponse;
2828
import java.io.FileNotFoundException;
2929
import java.io.IOException;
3030

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/LinkManagerToClient.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
2121
import com.google.ads.googleads.lib.utils.FieldMasks;
22-
import com.google.ads.googleads.v11.enums.ManagerLinkStatusEnum.ManagerLinkStatus;
23-
import com.google.ads.googleads.v11.errors.GoogleAdsError;
24-
import com.google.ads.googleads.v11.errors.GoogleAdsException;
25-
import com.google.ads.googleads.v11.services.CustomerClientLinkOperation;
26-
import com.google.ads.googleads.v11.services.CustomerClientLinkServiceClient;
27-
import com.google.ads.googleads.v11.services.CustomerManagerLinkOperation;
28-
import com.google.ads.googleads.v11.services.CustomerManagerLinkServiceClient;
29-
import com.google.ads.googleads.v11.services.GoogleAdsRow;
30-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient;
31-
import com.google.ads.googleads.v11.services.GoogleAdsServiceClient.SearchPagedResponse;
32-
import com.google.ads.googleads.v11.services.MutateCustomerClientLinkResponse;
33-
import com.google.ads.googleads.v11.services.MutateCustomerManagerLinkResponse;
34-
import com.google.ads.googleads.v11.utils.ResourceNames;
22+
import com.google.ads.googleads.v12.enums.ManagerLinkStatusEnum.ManagerLinkStatus;
23+
import com.google.ads.googleads.v12.errors.GoogleAdsError;
24+
import com.google.ads.googleads.v12.errors.GoogleAdsException;
25+
import com.google.ads.googleads.v12.services.CustomerClientLinkOperation;
26+
import com.google.ads.googleads.v12.services.CustomerClientLinkServiceClient;
27+
import com.google.ads.googleads.v12.services.CustomerManagerLinkOperation;
28+
import com.google.ads.googleads.v12.services.CustomerManagerLinkServiceClient;
29+
import com.google.ads.googleads.v12.services.GoogleAdsRow;
30+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
31+
import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
32+
import com.google.ads.googleads.v12.services.MutateCustomerClientLinkResponse;
33+
import com.google.ads.googleads.v12.services.MutateCustomerManagerLinkResponse;
34+
import com.google.ads.googleads.v12.utils.ResourceNames;
3535
import java.io.FileNotFoundException;
3636
import java.io.IOException;
3737
import java.util.Arrays;

0 commit comments

Comments
 (0)