Merge pull request #51 from yas-okadatech/feature/update_v16

bump Google Ads SDK to 30.0.0 (support for Google Ads API v16.0)

Author: d-hrs

gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

shadow-google-ads-helper/build.gradle

@@ -30,7 +30,7 @@ configurations {
 }
 
 dependencies {
-    compile("com.google.api-ads:google-ads:26.1.0") {
+    compile("com.google.api-ads:google-ads:30.0.0") {
         exclude group: "commons-logging", module: "commons-logging"
     }
 
@@ -47,3 +47,13 @@ shadowJar {
     relocate "com.google.thirdparty.publicsuffix", "embulk.google-ads.com.google.thirdparty.publicsuffix"
     relocate "com.fasterxml.jackson", "embulk.google-ads.com.fasterxml.jackson"
 }
+
+// https://github.com/google/guava/issues/6612#issuecomment-1614992368
+sourceSets.all {
+  configurations.getByName(runtimeClasspathConfigurationName) {
+    attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+  }
+  configurations.getByName(compileClasspathConfigurationName) {
+    attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+  }
+}

shadow-google-ads-helper/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -0,0 +1,63 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.google.android:annotations:4.1.1.4
+com.google.api-ads:google-ads-codegen:30.0.0
+com.google.api-ads:google-ads-stubs-lib:30.0.0
+com.google.api-ads:google-ads-stubs-v14:30.0.0
+com.google.api-ads:google-ads-stubs-v15:30.0.0
+com.google.api-ads:google-ads-stubs-v16:30.0.0
+com.google.api-ads:google-ads:30.0.0
+com.google.api.grpc:proto-google-common-protos:2.34.0
+com.google.api:api-common:2.26.0
+com.google.api:gax-grpc:2.43.0
+com.google.api:gax:2.43.0
+com.google.auth:google-auth-library-credentials:1.23.0
+com.google.auth:google-auth-library-oauth2-http:1.23.0
+com.google.auto.service:auto-service-annotations:1.0.1
+com.google.auto.service:auto-service:1.0.1
+com.google.auto.value:auto-value-annotations:1.10.4
+com.google.auto:auto-common:1.2
+com.google.cloud:google-cloud-shared-dependencies:3.25.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.10.1
+com.google.errorprone:error_prone_annotations:2.24.1
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:32.1.3-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.http-client:google-http-client-gson:1.44.1
+com.google.http-client:google-http-client:1.44.1
+com.google.j2objc:j2objc-annotations:2.8
+com.google.protobuf:protobuf-java-util:3.25.2
+com.google.protobuf:protobuf-java:3.25.2
+com.google.re2j:re2j:1.7
+com.squareup:javapoet:1.11.1
+commons-codec:commons-codec:1.16.1
+io.grpc:grpc-alts:1.61.1
+io.grpc:grpc-api:1.61.1
+io.grpc:grpc-auth:1.61.1
+io.grpc:grpc-context:1.61.1
+io.grpc:grpc-core:1.61.1
+io.grpc:grpc-googleapis:1.61.1
+io.grpc:grpc-grpclb:1.61.1
+io.grpc:grpc-inprocess:1.61.1
+io.grpc:grpc-netty-shaded:1.61.1
+io.grpc:grpc-protobuf-lite:1.61.1
+io.grpc:grpc-protobuf:1.61.1
+io.grpc:grpc-services:1.61.1
+io.grpc:grpc-stub:1.61.1
+io.grpc:grpc-util:1.61.1
+io.grpc:grpc-xds:1.61.1
+io.opencensus:opencensus-api:0.31.1
+io.opencensus:opencensus-contrib-http-util:0.31.1
+io.opencensus:opencensus-proto:0.2.0
+io.perfmark:perfmark-api:0.27.0
+javax.annotation:javax.annotation-api:1.3.2
+org.apache.httpcomponents:httpclient:4.5.14
+org.apache.httpcomponents:httpcore:4.4.16
+org.checkerframework:checker-qual:3.42.0
+org.codehaus.mojo:animal-sniffer-annotations:1.23
+org.conscrypt:conscrypt-openjdk-uber:2.5.2
+org.slf4j:jcl-over-slf4j:1.7.12
+org.slf4j:slf4j-api:1.7.25
+org.threeten:threetenbp:1.6.8

shadow-google-ads-helper/gradle/dependency-locks/shadow.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

src/main/java/org/embulk/input/google_ads/GoogleAdsInputPlugin.java

@@ -1,7 +1,7 @@
 package org.embulk.input.google_ads;
 
-import com.google.ads.googleads.v14.services.GoogleAdsRow;
-import com.google.ads.googleads.v14.services.GoogleAdsServiceClient;
+import com.google.ads.googleads.v16.services.GoogleAdsRow;
+import com.google.ads.googleads.v16.services.GoogleAdsServiceClient;
 import com.google.common.collect.ImmutableList;
 
 import org.embulk.config.ConfigDiff;

src/main/java/org/embulk/input/google_ads/GoogleAdsReporter.java

@@ -7,9 +7,9 @@
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.ads.googleads.lib.GoogleAdsClient;
-import com.google.ads.googleads.v14.services.GoogleAdsRow;
-import com.google.ads.googleads.v14.services.GoogleAdsServiceClient;
-import com.google.ads.googleads.v14.services.SearchGoogleAdsRequest;
+import com.google.ads.googleads.v16.services.GoogleAdsRow;
+import com.google.ads.googleads.v16.services.GoogleAdsServiceClient;
+import com.google.ads.googleads.v16.services.SearchGoogleAdsRequest;
 import com.google.auth.oauth2.UserCredentials;
 import com.google.common.base.CaseFormat;
 import com.google.protobuf.Descriptors;
@@ -61,7 +61,7 @@ private Iterable<GoogleAdsServiceClient.SearchPage> search(Map<String, String> p
         String query = buildQuery(task, params);
         logger.info(query);
         SearchGoogleAdsRequest request = buildRequest(task, query);
-        GoogleAdsServiceClient googleAdsService = client.getVersion14().createGoogleAdsServiceClient();
+        GoogleAdsServiceClient googleAdsService = client.getVersion16().createGoogleAdsServiceClient();
         GoogleAdsServiceClient.SearchPagedResponse response = googleAdsService.search(request);
         return response.iteratePages();
     }