From c24d8652d30f78471564cdc29dc22815afe01205 Mon Sep 17 00:00:00 2001 From: mzumi Date: Thu, 5 Jan 2023 17:27:46 +0900 Subject: [PATCH 1/2] update Google Ads API to v12 --- shadow-google-ads-helper/build.gradle | 2 +- .../org/embulk/input/google_ads/GoogleAdsInputPlugin.java | 4 ++-- .../java/org/embulk/input/google_ads/GoogleAdsReporter.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shadow-google-ads-helper/build.gradle b/shadow-google-ads-helper/build.gradle index 2b7bf9b..c7ee7d3 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:19.0.0") { + compile("com.google.api-ads:google-ads:22.0.0") { exclude group: "commons-logging", module: "commons-logging" } 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 49c4931..5c5e877 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.v11.services.GoogleAdsRow; -import com.google.ads.googleads.v11.services.GoogleAdsServiceClient; +import com.google.ads.googleads.v12.services.GoogleAdsRow; +import com.google.ads.googleads.v12.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 e3459c8..ed3a73d 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.v11.services.GoogleAdsServiceClient; -import com.google.ads.googleads.v11.services.SearchGoogleAdsRequest; +import com.google.ads.googleads.v12.services.GoogleAdsServiceClient; +import com.google.ads.googleads.v12.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.getVersion11().createGoogleAdsServiceClient(); + GoogleAdsServiceClient googleAdsService = client.getVersion12().createGoogleAdsServiceClient(); GoogleAdsServiceClient.SearchPagedResponse response = googleAdsService.search(request); return response.iteratePages(); } From 012e1d559902a5fa627378a6fdbe15a1c238d744 Mon Sep 17 00:00:00 2001 From: mzumi Date: Fri, 13 Jan 2023 18:25:25 +0900 Subject: [PATCH 2/2] Update com.github.johnrengelman.shadow --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0838845..c81fccb 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id "java" id "checkstyle" id "maven-publish" - id "com.github.johnrengelman.shadow" version "5.2.0" apply false + id "com.github.johnrengelman.shadow" version "6.0.0" apply false id "org.embulk.embulk-plugins" version "0.4.2" id "com.palantir.git-version" version "0.13.0" }