Changes for release v13. (#689)

Author: jradcliff

buildSrc/build.gradle

@@ -26,6 +26,6 @@ repositories {
 }
 
 dependencies {
-    implementation "com.google.http-client:google-http-client:1.41.4"
-    implementation "com.google.http-client:google-http-client-xml:1.41.4"
+    implementation "com.google.http-client:google-http-client:1.42.3"
+    implementation "com.google.http-client:google-http-client-xml:1.42.3"
 }

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

@@ -146,15 +146,14 @@ if (project.properties.containsKey("release")) {
 dependencies {
   api 'com.google.api:gax'
   api 'com.google.api:gax-grpc'
-  // Generated code requires at least 3.19.6 of protobuf-java.
-  api 'com.google.protobuf:protobuf-java:3.19.6'
-  api 'com.google.protobuf:protobuf-java-util:3.19.6'
+  api 'com.google.protobuf:protobuf-java'
+  implementation 'com.google.protobuf:protobuf-java-util'
   api 'io.grpc:grpc-stub'
   api 'io.grpc:grpc-protobuf'
-  api 'com.google.auth:google-auth-library-oauth2-http:1.5.3'
-  api 'com.google.auth:google-auth-library-credentials:1.5.3'
-  api platform('com.google.cloud:google-cloud-shared-dependencies:2.8.0')
-  implementation 'com.google.guava:guava:31.0.1-android'
+  api 'com.google.auth:google-auth-library-oauth2-http:1.14.0'
+  api 'com.google.auth:google-auth-library-credentials:1.14.0'
+  api platform('com.google.cloud:google-cloud-shared-dependencies:3.1.2')
+  implementation 'com.google.guava:guava:31.1-android'
   implementation 'com.google.auto.service:auto-service:1.0.1'
   implementation 'javax.annotation:javax.annotation-api'
   annotationProcessor 'com.google.auto.service:auto-service:1.0.1'

buildSrc/src/main/groovy/com.google.api-ads.nexus-publish.gradle

@@ -176,17 +176,24 @@ class SonatypeClient {
      * based on the sonatype server load.
      */
     def discoverSonatypeRepositoryUrl() {
+        // Ensures that we don't create spurious repositories unless we:
+        // 1. have set the 'release' property; and
+        // 2. are running tasks that include publishing to Sonatype
+        // There are instances where we do #1 in order to test the release process or prepare for
+        // a release, but we don't do #2.
+        if (!(project.properties.containsKey("release") &&
+                project.tasks.stream()
+                        .anyMatch { it.name.matches("publish.+ToSonatypeRepository") })) {
+            logger.debug(
+                    "Release not enabled or does not include Sonatype publishing tasks. " +
+                            "Defaulting to auto-staging.")
+            return AUTO_STAGING_URL
+        }
         try {
-            // Ensures that we don't create spurious repositories if we're not running a release.
-            if (project.properties.containsKey("release")) {
-                // Gradle may reuse the demon (hence its classloader) so this uses a map to store
-                // the staging repo for each build.
-                return STAGING_URL_CACHE.computeIfAbsent(
-                        project.rootProject, { project -> this.createStagingRepository() })
-            } else {
-                logger.debug("Release not enabled, defaulting to auto-staging")
-                return AUTO_STAGING_URL
-            }
+            // Gradle may reuse the daemon (hence its classloader) so this uses a map to store
+            // the staging repo for each build.
+            return STAGING_URL_CACHE.computeIfAbsent(
+                    project.rootProject, { project -> this.createStagingRepository() })
         } catch (Exception ex) {
             // Handles issues by falling back to auto-staging.
             logger.warn("Failed to create new staging repo. Attempting to deploy with " +

google-ads-codegen/build.gradle

@@ -25,7 +25,7 @@ dependencies {
     api project(":google-ads-stubs-lib")
     implementation 'org.slf4j:slf4j-api:1.7.25'
     implementation 'com.squareup:javapoet:1.11.1'
-    testImplementation 'com.google.api:gax-grpc:2.12.2:testlib'
+    testImplementation 'com.google.api:gax-grpc:2.22.0:testlib'
     testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'
     testImplementation 'org.mockito:mockito-all:1.9.5'
     // Finds all the stubs modules and adds these as dependencies.

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

@@ -19,16 +19,16 @@
 import com.google.ads.googleads.examples.utils.CodeSampleParams;
 import com.google.ads.googleads.lib.GoogleAdsClient;
 import com.google.ads.googleads.lib.utils.FieldMasks;
-import com.google.ads.googleads.v12.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
-import com.google.ads.googleads.v12.errors.GoogleAdsError;
-import com.google.ads.googleads.v12.errors.GoogleAdsException;
-import com.google.ads.googleads.v12.resources.MerchantCenterLink;
-import com.google.ads.googleads.v12.services.ListMerchantCenterLinksRequest;
-import com.google.ads.googleads.v12.services.ListMerchantCenterLinksResponse;
-import com.google.ads.googleads.v12.services.MerchantCenterLinkOperation;
-import com.google.ads.googleads.v12.services.MerchantCenterLinkServiceClient;
-import com.google.ads.googleads.v12.services.MutateMerchantCenterLinkResponse;
-import com.google.ads.googleads.v12.services.MutateMerchantCenterLinkResult;
+import com.google.ads.googleads.v13.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
+import com.google.ads.googleads.v13.errors.GoogleAdsError;
+import com.google.ads.googleads.v13.errors.GoogleAdsException;
+import com.google.ads.googleads.v13.resources.MerchantCenterLink;
+import com.google.ads.googleads.v13.services.ListMerchantCenterLinksRequest;
+import com.google.ads.googleads.v13.services.ListMerchantCenterLinksResponse;
+import com.google.ads.googleads.v13.services.MerchantCenterLinkOperation;
+import com.google.ads.googleads.v13.services.MerchantCenterLinkServiceClient;
+import com.google.ads.googleads.v13.services.MutateMerchantCenterLinkResponse;
+import com.google.ads.googleads.v13.services.MutateMerchantCenterLinkResult;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 

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

@@ -18,11 +18,11 @@
 import com.google.ads.googleads.examples.utils.ArgumentNames;
 import com.google.ads.googleads.examples.utils.CodeSampleParams;
 import com.google.ads.googleads.lib.GoogleAdsClient;
-import com.google.ads.googleads.v12.errors.GoogleAdsError;
-import com.google.ads.googleads.v12.errors.GoogleAdsException;
-import com.google.ads.googleads.v12.resources.Customer;
-import com.google.ads.googleads.v12.services.CreateCustomerClientResponse;
-import com.google.ads.googleads.v12.services.CustomerServiceClient;
+import com.google.ads.googleads.v13.errors.GoogleAdsError;
+import com.google.ads.googleads.v13.errors.GoogleAdsException;
+import com.google.ads.googleads.v13.resources.Customer;
+import com.google.ads.googleads.v13.services.CreateCustomerClientResponse;
+import com.google.ads.googleads.v13.services.CustomerServiceClient;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.time.ZonedDateTime;

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

@@ -18,17 +18,17 @@
 import com.google.ads.googleads.examples.utils.ArgumentNames;
 import com.google.ads.googleads.examples.utils.CodeSampleParams;
 import com.google.ads.googleads.lib.GoogleAdsClient;
-import com.google.ads.googleads.v12.errors.GoogleAdsError;
-import com.google.ads.googleads.v12.errors.GoogleAdsException;
-import com.google.ads.googleads.v12.resources.CustomerClient;
-import com.google.ads.googleads.v12.resources.CustomerName;
-import com.google.ads.googleads.v12.services.CustomerServiceClient;
-import com.google.ads.googleads.v12.services.GoogleAdsRow;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
-import com.google.ads.googleads.v12.services.ListAccessibleCustomersRequest;
-import com.google.ads.googleads.v12.services.ListAccessibleCustomersResponse;
-import com.google.ads.googleads.v12.services.SearchGoogleAdsRequest;
+import com.google.ads.googleads.v13.errors.GoogleAdsError;
+import com.google.ads.googleads.v13.errors.GoogleAdsException;
+import com.google.ads.googleads.v13.resources.CustomerClient;
+import com.google.ads.googleads.v13.resources.CustomerName;
+import com.google.ads.googleads.v13.services.CustomerServiceClient;
+import com.google.ads.googleads.v13.services.GoogleAdsRow;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
+import com.google.ads.googleads.v13.services.ListAccessibleCustomersRequest;
+import com.google.ads.googleads.v13.services.ListAccessibleCustomersResponse;
+import com.google.ads.googleads.v13.services.SearchGoogleAdsRequest;
 import com.google.common.base.Strings;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;

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

@@ -18,12 +18,12 @@
 import com.google.ads.googleads.examples.utils.ArgumentNames;
 import com.google.ads.googleads.examples.utils.CodeSampleParams;
 import com.google.ads.googleads.lib.GoogleAdsClient;
-import com.google.ads.googleads.v12.errors.GoogleAdsError;
-import com.google.ads.googleads.v12.errors.GoogleAdsException;
-import com.google.ads.googleads.v12.resources.Customer;
-import com.google.ads.googleads.v12.services.GoogleAdsRow;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
+import com.google.ads.googleads.v13.errors.GoogleAdsError;
+import com.google.ads.googleads.v13.errors.GoogleAdsException;
+import com.google.ads.googleads.v13.resources.Customer;
+import com.google.ads.googleads.v13.services.GoogleAdsRow;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 

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

@@ -19,15 +19,15 @@
 import com.google.ads.googleads.examples.utils.CodeSampleParams;
 import com.google.ads.googleads.lib.GoogleAdsClient;
 import com.google.ads.googleads.lib.utils.FieldMasks;
-import com.google.ads.googleads.v12.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
-import com.google.ads.googleads.v12.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
-import com.google.ads.googleads.v12.errors.GoogleAdsError;
-import com.google.ads.googleads.v12.errors.GoogleAdsException;
-import com.google.ads.googleads.v12.resources.ChangeEvent;
-import com.google.ads.googleads.v12.resources.ChangeEvent.ChangedResource;
-import com.google.ads.googleads.v12.services.GoogleAdsRow;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
+import com.google.ads.googleads.v13.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
+import com.google.ads.googleads.v13.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
+import com.google.ads.googleads.v13.errors.GoogleAdsError;
+import com.google.ads.googleads.v13.errors.GoogleAdsException;
+import com.google.ads.googleads.v13.resources.ChangeEvent;
+import com.google.ads.googleads.v13.resources.ChangeEvent.ChangedResource;
+import com.google.ads.googleads.v13.services.GoogleAdsRow;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
 import com.google.protobuf.Message;
 import java.io.FileNotFoundException;
 import java.io.IOException;

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

@@ -18,12 +18,12 @@
 import com.google.ads.googleads.examples.utils.ArgumentNames;
 import com.google.ads.googleads.examples.utils.CodeSampleParams;
 import com.google.ads.googleads.lib.GoogleAdsClient;
-import com.google.ads.googleads.v12.errors.GoogleAdsError;
-import com.google.ads.googleads.v12.errors.GoogleAdsException;
-import com.google.ads.googleads.v12.resources.ChangeStatus;
-import com.google.ads.googleads.v12.services.GoogleAdsRow;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient;
-import com.google.ads.googleads.v12.services.GoogleAdsServiceClient.SearchPagedResponse;
+import com.google.ads.googleads.v13.errors.GoogleAdsError;
+import com.google.ads.googleads.v13.errors.GoogleAdsException;
+import com.google.ads.googleads.v13.resources.ChangeStatus;
+import com.google.ads.googleads.v13.services.GoogleAdsRow;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient;
+import com.google.ads.googleads.v13.services.GoogleAdsServiceClient.SearchPagedResponse;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Optional;