From e4b232147cb8e637e33efa42368efbf37a1026e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=B1=B1=20=E6=99=83?= Date: Fri, 29 Jul 2022 09:56:40 +0900 Subject: [PATCH 1/3] update google-ads v11 --- shadow-google-ads-helper/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shadow-google-ads-helper/build.gradle b/shadow-google-ads-helper/build.gradle index 6cafb8c..2b7bf9b 100644 --- a/shadow-google-ads-helper/build.gradle +++ b/shadow-google-ads-helper/build.gradle @@ -30,7 +30,7 @@ configurations { } dependencies { - compile("com.google.api-ads:google-ads:17.0.1") { + compile("com.google.api-ads:google-ads:19.0.0") { exclude group: "commons-logging", module: "commons-logging" } From fb48db5af0c024daf11d231ec5d85307dcbff765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=B1=B1=20=E6=99=83?= Date: Fri, 29 Jul 2022 10:18:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=BF=E3=82=B0=E3=81=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E6=99=82=E3=81=AF=E9=96=8B=E7=99=BA=E7=94=A8=E3=81=AE?= =?UTF-8?q?gem=E3=81=8C=E7=94=9F=E6=88=90=E3=81=95=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=AE=9F=E8=A3=85=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bbc0f9f..0838845 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ version = { if (vd.commitDistance == 0 && vd.lastTag ==~ /^[0-9]+\.[0-9]+\.[0-9]+(\.[a-zA-Z0-9]+)?/) { vd.lastTag } else { - "${baseVersion}.${vd.gitHash}.pre" + "0.0.0.${vd.gitHash}" } }() From 74238628dac298525b17e807c0853ce2e5c94ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E5=B1=B1=20=E6=99=83?= Date: Fri, 29 Jul 2022 10:35:18 +0900 Subject: [PATCH 3/3] =?UTF-8?q?v10=E3=82=92v11=E3=81=ABupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/embulk/input/google_ads/GoogleAdsInputPlugin.java | 4 ++-- .../java/org/embulk/input/google_ads/GoogleAdsReporter.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/embulk/input/google_ads/GoogleAdsInputPlugin.java b/src/main/java/org/embulk/input/google_ads/GoogleAdsInputPlugin.java index 95449c0..49c4931 100644 --- a/src/main/java/org/embulk/input/google_ads/GoogleAdsInputPlugin.java +++ b/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.v10.services.GoogleAdsRow; -import com.google.ads.googleads.v10.services.GoogleAdsServiceClient; +import com.google.ads.googleads.v11.services.GoogleAdsRow; +import com.google.ads.googleads.v11.services.GoogleAdsServiceClient; import com.google.common.collect.ImmutableList; import org.embulk.config.ConfigDiff; diff --git a/src/main/java/org/embulk/input/google_ads/GoogleAdsReporter.java b/src/main/java/org/embulk/input/google_ads/GoogleAdsReporter.java index 70868eb..e3459c8 100644 --- a/src/main/java/org/embulk/input/google_ads/GoogleAdsReporter.java +++ b/src/main/java/org/embulk/input/google_ads/GoogleAdsReporter.java @@ -7,8 +7,8 @@ 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.v10.services.GoogleAdsServiceClient; -import com.google.ads.googleads.v10.services.SearchGoogleAdsRequest; +import com.google.ads.googleads.v11.services.GoogleAdsServiceClient; +import com.google.ads.googleads.v11.services.SearchGoogleAdsRequest; import com.google.auth.oauth2.UserCredentials; import com.google.common.base.CaseFormat; import com.google.protobuf.Descriptors; @@ -57,7 +57,7 @@ public Iterable getReportPage() String query = buildQuery(task); logger.info(query); SearchGoogleAdsRequest request = buildRequest(task, query); - GoogleAdsServiceClient googleAdsService = client.getVersion10().createGoogleAdsServiceClient(); + GoogleAdsServiceClient googleAdsService = client.getVersion11().createGoogleAdsServiceClient(); GoogleAdsServiceClient.SearchPagedResponse response = googleAdsService.search(request); return response.iteratePages(); }