merge main

mhuang74 · Nov 21, 2024 · e691599 · e691599
2 parents 245aed2 + 9d2e6ec
commit e691599
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "mcc-gaql"
 description = "Execute GAQL across MCC child accounts."
-version = "0.8.2"
+version = "0.9.1"
 authors = ["Michael S. Huang <[email protected]>"]
 edition = "2021"
 
@@ -17,8 +17,8 @@ dirs = "4.0"
 figment = { version = "0.10", features = ["toml", "env"] }
 flexi_logger = { version = "0.22", features = ["compress"] }
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
-googleads-rs = { version = "0.8" }
-#googleads-rs = { version = "0.8", path = "../googleads-rs" }
+googleads-rs = { version = "0.9.0" }
+#googleads-rs = { version = "0.9.0", path = "../googleads-rs" }
 itertools = "0.10"
 log = "0.4"
 polars = "0.42"

diff --git a/src/googleads.rs b/src/googleads.rs
@@ -15,10 +15,10 @@ use yup_oauth2::{
     AccessToken, ApplicationSecret, InstalledFlowAuthenticator, InstalledFlowReturnMethod,
 };
 
-use googleads_rs::google::ads::googleads::v17::services::google_ads_field_service_client::GoogleAdsFieldServiceClient;
-use googleads_rs::google::ads::googleads::v17::services::google_ads_service_client::GoogleAdsServiceClient;
-use googleads_rs::google::ads::googleads::v17::resources::GoogleAdsField;
-use googleads_rs::google::ads::googleads::v17::services::{
+use googleads_rs::google::ads::googleads::v18::services::google_ads_field_service_client::GoogleAdsFieldServiceClient;
+use googleads_rs::google::ads::googleads::v18::services::google_ads_service_client::GoogleAdsServiceClient;
+use googleads_rs::google::ads::googleads::v18::resources::GoogleAdsField;
+use googleads_rs::google::ads::googleads::v18::services::{
     GoogleAdsRow, SearchGoogleAdsFieldsRequest, SearchGoogleAdsFieldsResponse,
     SearchGoogleAdsStreamRequest, SearchGoogleAdsStreamResponse,
 };

diff --git a/src/main.rs b/src/main.rs
@@ -12,7 +12,7 @@ use anyhow::{Context, Result};
 use futures::{stream::FuturesUnordered, StreamExt};
 
 use googleads::GoogleAdsAPIAccess;
-use googleads_rs::google::ads::googleads::v17::services::google_ads_service_client::GoogleAdsServiceClient;
+use googleads_rs::google::ads::googleads::v18::services::google_ads_service_client::GoogleAdsServiceClient;
 use polars::prelude::*;
 use thousands::Separable;
 use tonic::{codegen::InterceptedService, transport::Channel};

diff --git a/src/util.rs b/src/util.rs
@@ -94,7 +94,7 @@ where
 
             let lines = BufReader::new(&file).lines();
 
-            for line in lines.flatten() {
+            for line in lines.map_while(Result::ok) {
                 customer_ids.push(line);
             }