Skip to content

Commit 1546413

Browse files
jradcliffjradcliff
authored
Changes for release v14. (#713)
1 parent cd7142d commit 1546413

9,351 files changed

Lines changed: 2371428 additions & 50772 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: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,23 +170,33 @@ dependencies {
170170
implementation 'com.google.protobuf:protobuf-java-util'
171171
api 'io.grpc:grpc-stub'
172172
api 'io.grpc:grpc-protobuf'
173-
api 'com.google.auth:google-auth-library-oauth2-http:1.14.0'
174-
api 'com.google.auth:google-auth-library-credentials:1.14.0'
175-
api platform('com.google.cloud:google-cloud-shared-dependencies:3.1.2')
176-
implementation 'com.google.guava:guava:31.1-android'
173+
api 'com.google.auth:google-auth-library-oauth2-http'
174+
api 'com.google.auth:google-auth-library-credentials'
175+
api platform('com.google.cloud:google-cloud-shared-dependencies:3.11.0')
176+
implementation 'com.google.guava:guava'
177177
implementation 'com.google.auto.service:auto-service:1.0.1'
178178
implementation 'javax.annotation:javax.annotation-api'
179179
annotationProcessor 'com.google.auto.service:auto-service:1.0.1'
180180
testImplementation 'junit:junit:4.13.1'
181181
}
182182

183-
// Disables a task unless we're publishing something.
184-
def disableUnlessPublishing(toDisable) {
185-
toDisable.enabled = false
183+
// Disables a task unless we're publishing something and we're not doing
184+
// a fast build.
185+
def disableUnlessPublishing(taskToDisable) {
186+
// Disables the task.
187+
taskToDisable.enabled = false
188+
189+
// Leaves the task disabled if the 'fastbuild' property was set.
190+
if (project.properties.containsKey('fastbuild')) {
191+
logger.warn('Skipping {} because "fastbuild" property is set', taskToDisable)
192+
return
193+
}
194+
// Once the task graph is ready, checks if it contains publishing tasks. If it
195+
// does, rolls back the change above and re-enables `taskToDisable`.
186196
gradle.taskGraph.whenReady {
187197
gradle.taskGraph.allTasks
188198
.findAll { it.group == "publishing" }
189-
.any { toDisable.enabled = true }
199+
.any { taskToDisable.enabled = true }
190200
}
191201
}
192202
disableUnlessPublishing(tasks.javadocJar)

‎google-ads-codegen/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
api project(":google-ads-stubs-lib")
2626
implementation 'org.slf4j:slf4j-api:1.7.25'
2727
implementation 'com.squareup:javapoet:1.11.1'
28-
testImplementation 'com.google.api:gax-grpc:2.22.0:testlib'
28+
testImplementation 'com.google.api:gax-grpc::testlib'
2929
testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
3030
testImplementation 'org.mockito:mockito-all:1.9.5'
3131
// Finds all the stubs modules and adds these as dependencies.

‎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.v13.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
23-
import com.google.ads.googleads.v13.errors.GoogleAdsError;
24-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
25-
import com.google.ads.googleads.v13.resources.MerchantCenterLink;
26-
import com.google.ads.googleads.v13.services.ListMerchantCenterLinksRequest;
27-
import com.google.ads.googleads.v13.services.ListMerchantCenterLinksResponse;
28-
import com.google.ads.googleads.v13.services.MerchantCenterLinkOperation;
29-
import com.google.ads.googleads.v13.services.MerchantCenterLinkServiceClient;
30-
import com.google.ads.googleads.v13.services.MutateMerchantCenterLinkResponse;
31-
import com.google.ads.googleads.v13.services.MutateMerchantCenterLinkResult;
22+
import com.google.ads.googleads.v14.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
23+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
24+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
25+
import com.google.ads.googleads.v14.resources.MerchantCenterLink;
26+
import com.google.ads.googleads.v14.services.ListMerchantCenterLinksRequest;
27+
import com.google.ads.googleads.v14.services.ListMerchantCenterLinksResponse;
28+
import com.google.ads.googleads.v14.services.MerchantCenterLinkOperation;
29+
import com.google.ads.googleads.v14.services.MerchantCenterLinkServiceClient;
30+
import com.google.ads.googleads.v14.services.MutateMerchantCenterLinkResponse;
31+
import com.google.ads.googleads.v14.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.v13.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v13.resources.Customer;
24-
import com.google.ads.googleads.v13.services.CreateCustomerClientResponse;
25-
import com.google.ads.googleads.v13.services.CustomerServiceClient;
21+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v14.resources.Customer;
24+
import com.google.ads.googleads.v14.services.CreateCustomerClientResponse;
25+
import com.google.ads.googleads.v14.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.v13.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v13.resources.CustomerClient;
24-
import com.google.ads.googleads.v13.resources.CustomerName;
25-
import com.google.ads.googleads.v13.services.CustomerServiceClient;
26-
import com.google.ads.googleads.v13.services.GoogleAdsRow;
27-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
28-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
29-
import com.google.ads.googleads.v13.services.ListAccessibleCustomersRequest;
30-
import com.google.ads.googleads.v13.services.ListAccessibleCustomersResponse;
31-
import com.google.ads.googleads.v13.services.SearchGoogleAdsRequest;
21+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v14.resources.CustomerClient;
24+
import com.google.ads.googleads.v14.resources.CustomerName;
25+
import com.google.ads.googleads.v14.services.CustomerServiceClient;
26+
import com.google.ads.googleads.v14.services.GoogleAdsRow;
27+
import com.google.ads.googleads.v14.services.GoogleAdsServiceClient;
28+
import com.google.ads.googleads.v14.services.GoogleAdsServiceClient.SearchPagedResponse;
29+
import com.google.ads.googleads.v14.services.ListAccessibleCustomersRequest;
30+
import com.google.ads.googleads.v14.services.ListAccessibleCustomersResponse;
31+
import com.google.ads.googleads.v14.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.v13.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v13.resources.Customer;
24-
import com.google.ads.googleads.v13.services.GoogleAdsRow;
25-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
26-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v14.resources.Customer;
24+
import com.google.ads.googleads.v14.services.GoogleAdsRow;
25+
import com.google.ads.googleads.v14.services.GoogleAdsServiceClient;
26+
import com.google.ads.googleads.v14.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.v13.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
23-
import com.google.ads.googleads.v13.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
24-
import com.google.ads.googleads.v13.errors.GoogleAdsError;
25-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
26-
import com.google.ads.googleads.v13.resources.ChangeEvent;
27-
import com.google.ads.googleads.v13.resources.ChangeEvent.ChangedResource;
28-
import com.google.ads.googleads.v13.services.GoogleAdsRow;
29-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
30-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
22+
import com.google.ads.googleads.v14.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
23+
import com.google.ads.googleads.v14.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
24+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
25+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
26+
import com.google.ads.googleads.v14.resources.ChangeEvent;
27+
import com.google.ads.googleads.v14.resources.ChangeEvent.ChangedResource;
28+
import com.google.ads.googleads.v14.services.GoogleAdsRow;
29+
import com.google.ads.googleads.v14.services.GoogleAdsServiceClient;
30+
import com.google.ads.googleads.v14.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.v13.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v13.resources.ChangeStatus;
24-
import com.google.ads.googleads.v13.services.GoogleAdsRow;
25-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
26-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v14.resources.ChangeStatus;
24+
import com.google.ads.googleads.v14.services.GoogleAdsRow;
25+
import com.google.ads.googleads.v14.services.GoogleAdsServiceClient;
26+
import com.google.ads.googleads.v14.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.v13.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v13.services.GoogleAdsRow;
24-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
25-
import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v14.services.GoogleAdsRow;
24+
import com.google.ads.googleads.v14.services.GoogleAdsServiceClient;
25+
import com.google.ads.googleads.v14.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.v13.enums.AccessRoleEnum.AccessRole;
22-
import com.google.ads.googleads.v13.errors.GoogleAdsError;
23-
import com.google.ads.googleads.v13.errors.GoogleAdsException;
24-
import com.google.ads.googleads.v13.resources.CustomerUserAccessInvitation;
25-
import com.google.ads.googleads.v13.services.CustomerUserAccessInvitationOperation;
26-
import com.google.ads.googleads.v13.services.CustomerUserAccessInvitationServiceClient;
27-
import com.google.ads.googleads.v13.services.MutateCustomerUserAccessInvitationResponse;
21+
import com.google.ads.googleads.v14.enums.AccessRoleEnum.AccessRole;
22+
import com.google.ads.googleads.v14.errors.GoogleAdsError;
23+
import com.google.ads.googleads.v14.errors.GoogleAdsException;
24+
import com.google.ads.googleads.v14.resources.CustomerUserAccessInvitation;
25+
import com.google.ads.googleads.v14.services.CustomerUserAccessInvitationOperation;
26+
import com.google.ads.googleads.v14.services.CustomerUserAccessInvitationServiceClient;
27+
import com.google.ads.googleads.v14.services.MutateCustomerUserAccessInvitationResponse;
2828
import java.io.FileNotFoundException;
2929
import java.io.IOException;
3030

0 commit comments

Comments
 (0)