From f4d77953c3a30861baf069d8b8b4b4d6757f8767 Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 25 Jul 2024 21:52:58 -0700 Subject: [PATCH] Update prost dependency, re-generate googleplay.rs, bump version --- googleplay-protobuf/Cargo.toml | 6 +- googleplay-protobuf/protos/GooglePlay.proto | 20 +++ googleplay-protobuf/src/googleplay.rs | 145 +++++++++++++------- 3 files changed, 119 insertions(+), 52 deletions(-) diff --git a/googleplay-protobuf/Cargo.toml b/googleplay-protobuf/Cargo.toml index 9956d74..5e72726 100644 --- a/googleplay-protobuf/Cargo.toml +++ b/googleplay-protobuf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "googleplay-protobuf" -version = "2.0.0" +version = "2.1.0" authors = ["Bill Budington "] build = "build.rs" license = "MIT" @@ -9,7 +9,7 @@ description = "The automatically generated types derived from the Google Play Pr repository = "https://github.com/EFForg/rs-google-play/tree/master/googleplay-protobuf" [dependencies] -prost = "0.12" +prost = "0.13" [build-dependencies] -prost-build = "0.12" +prost-build = "0.13" diff --git a/googleplay-protobuf/protos/GooglePlay.proto b/googleplay-protobuf/protos/GooglePlay.proto index 8845166..582aefb 100644 --- a/googleplay-protobuf/protos/GooglePlay.proto +++ b/googleplay-protobuf/protos/GooglePlay.proto @@ -1169,6 +1169,26 @@ message Item { optional bool useWishlistAsPrimaryAction = 33; optional string reviewQuestionsUrl = 34; optional string reviewSummaryUrl = 39; + optional ContentRating contentRating = 50; +} + +message ContentRating { + message ContentRatingImage { + message Dimension { + optional int32 width = 3; + optional int32 height = 4; + } + message Image { + optional string url = 1; + } + optional Dimension dimension = 3; + optional Image image = 6; + } + optional string title = 1; + optional string recommendationAndDescriptionHtml = 2; + optional ContentRatingImage contentRatingImage = 3; + optional string recommendation = 5; + optional string description = 6; } message AppInfo { diff --git a/googleplay-protobuf/src/googleplay.rs b/googleplay-protobuf/src/googleplay.rs index 12de6d8..6a8176b 100644 --- a/googleplay-protobuf/src/googleplay.rs +++ b/googleplay-protobuf/src/googleplay.rs @@ -1,3 +1,4 @@ +// This file is @generated by prost-build. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct AndroidAppDeliveryData { @@ -761,7 +762,7 @@ pub struct DocId { pub backend: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Install { #[prost(fixed64, optional, tag = "1")] pub android_id: ::core::option::Option, @@ -857,7 +858,7 @@ pub struct Offer { pub sale_message: ::core::option::Option<::prost::alloc::string::String>, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MonthAndDay { #[prost(uint32, optional, tag = "1")] pub month: ::core::option::Option, @@ -865,7 +866,7 @@ pub struct MonthAndDay { pub day: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct OfferPaymentPeriod { #[prost(message, optional, tag = "1")] pub duration: ::core::option::Option, @@ -875,7 +876,7 @@ pub struct OfferPaymentPeriod { pub end: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct OfferPaymentOverride { #[prost(int64, optional, tag = "1")] pub micros: ::core::option::Option, @@ -897,10 +898,10 @@ pub struct OfferPayment { pub offer_payment_override: ::prost::alloc::vec::Vec, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VoucherTerms {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RentalTerms { #[prost(int32, optional, tag = "1")] pub d_eprecated_grant_period_seconds: ::core::option::Option, @@ -926,7 +927,7 @@ pub struct SubscriptionContentTerms { pub required_subscription: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GroupLicenseInfo { #[prost(int32, optional, tag = "1")] pub licensed_offer_type: ::core::option::Option, @@ -970,7 +971,7 @@ pub struct OwnershipInfo { pub library_expiration_timestamp: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SubscriptionTerms { #[prost(message, optional, tag = "1")] pub recurring_period: ::core::option::Option, @@ -978,7 +979,7 @@ pub struct SubscriptionTerms { pub trial_period: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct TimePeriod { #[prost(int32, optional, tag = "1")] pub unit: ::core::option::Option, @@ -1252,7 +1253,7 @@ pub struct ContainerView { pub server_logs_cookie: ::core::option::Option<::prost::alloc::vec::Vec>, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct FlagContentResponse {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -1731,7 +1732,7 @@ pub struct Image { /// Nested message and enum types in `Image`. pub mod image { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Dimension { #[prost(int32, optional, tag = "3")] pub width: ::core::option::Option, @@ -2030,7 +2031,7 @@ pub struct DocumentDetails { pub subscription_details: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PatchDetails { #[prost(int32, optional, tag = "1")] pub base_version_code: ::core::option::Option, @@ -2054,7 +2055,7 @@ pub struct FileMetadata { pub patch_details: ::prost::alloc::vec::Vec, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SubscriptionDetails { #[prost(int32, optional, tag = "1")] pub subscription_period: ::core::option::Option, @@ -2164,6 +2165,52 @@ pub struct Item { pub review_questions_url: ::core::option::Option<::prost::alloc::string::String>, #[prost(string, optional, tag = "39")] pub review_summary_url: ::core::option::Option<::prost::alloc::string::String>, + #[prost(message, optional, tag = "50")] + pub content_rating: ::core::option::Option, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct ContentRating { + #[prost(string, optional, tag = "1")] + pub title: ::core::option::Option<::prost::alloc::string::String>, + #[prost(string, optional, tag = "2")] + pub recommendation_and_description_html: ::core::option::Option< + ::prost::alloc::string::String, + >, + #[prost(message, optional, tag = "3")] + pub content_rating_image: ::core::option::Option, + #[prost(string, optional, tag = "5")] + pub recommendation: ::core::option::Option<::prost::alloc::string::String>, + #[prost(string, optional, tag = "6")] + pub description: ::core::option::Option<::prost::alloc::string::String>, +} +/// Nested message and enum types in `ContentRating`. +pub mod content_rating { + #[allow(clippy::derive_partial_eq_without_eq)] + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct ContentRatingImage { + #[prost(message, optional, tag = "3")] + pub dimension: ::core::option::Option, + #[prost(message, optional, tag = "6")] + pub image: ::core::option::Option, + } + /// Nested message and enum types in `ContentRatingImage`. + pub mod content_rating_image { + #[allow(clippy::derive_partial_eq_without_eq)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] + pub struct Dimension { + #[prost(int32, optional, tag = "3")] + pub width: ::core::option::Option, + #[prost(int32, optional, tag = "4")] + pub height: ::core::option::Option, + } + #[allow(clippy::derive_partial_eq_without_eq)] + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct Image { + #[prost(string, optional, tag = "1")] + pub url: ::core::option::Option<::prost::alloc::string::String>, + } + } } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -2314,7 +2361,7 @@ pub struct OverlayMetaData { pub overlay_description: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct OverlayHeader {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -2850,7 +2897,7 @@ pub struct Notification { pub library_dirty_data: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PurchaseDeclinedData { #[prost(int32, optional, tag = "1")] pub reason: ::core::option::Option, @@ -2858,7 +2905,7 @@ pub struct PurchaseDeclinedData { pub show_notification: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PurchaseRemovalData { #[prost(bool, optional, tag = "1")] pub malicious: ::core::option::Option, @@ -2944,7 +2991,7 @@ pub struct ReviewTip { pub review_count: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct AcceptTosResponse {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -2997,7 +3044,7 @@ pub struct Experiments { pub experiment_id: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SelfUpdateConfig { #[prost(int32, optional, tag = "1")] pub latest_client_version_code: ::core::option::Option, @@ -3051,7 +3098,7 @@ pub struct TocResponse { pub cookie: ::core::option::Option<::prost::alloc::string::String>, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct UserSettings { #[prost(bool, optional, tag = "1")] pub tos_checkbox_marketing_emails_opted_in: ::core::option::Option, @@ -3059,7 +3106,7 @@ pub struct UserSettings { pub privacy_setting: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PrivacySetting { #[prost(int32, optional, tag = "1")] pub r#type: ::core::option::Option, @@ -3187,37 +3234,37 @@ pub struct Payload { pub review_summary_response: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct CheckIabPromoResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct UserActivitySettingsResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RecordUserActivityResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RedeemCodeResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SelfUpdateResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetInitialInstrumentFlowStateResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct CreateInstrumentResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ChallengeResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct BackDeviceChoicesResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct BackupDocumentChoicesResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct EarlyUpdateResponse {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -3249,40 +3296,40 @@ pub mod preloads_response { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MyAccountsResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ContentFilterResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ExperimentsResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SurveyResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PingResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct UpdateUserSettingResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetUserSettingsResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetSharingSettingsResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct UpdateSharingSettingsResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ReviewSnippetsResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct DocumentSharingStateResponse {} #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ModuleDeliveryResponse {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -3299,7 +3346,7 @@ pub struct PreFetch { pub soft_ttl: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ServerMetadata { #[prost(int64, optional, tag = "1")] pub latency_millis: ::core::option::Option, @@ -3556,19 +3603,19 @@ pub mod search_suggest_entry { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct TestingProgramResponse { #[prost(message, optional, tag = "2")] pub result: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct TestingProgramResult { #[prost(message, optional, tag = "4")] pub details: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct TestingProgramDetails { #[prost(bool, optional, tag = "2")] pub subscribed: ::core::option::Option, @@ -3847,7 +3894,7 @@ pub struct AppBucket { pub operation_count: ::core::option::Option, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct CounterData { #[prost(int64, optional, tag = "1")] pub bytes: ::core::option::Option, @@ -3917,7 +3964,7 @@ pub struct PayloadLevelAppStat { pub payload_level_app_bucket: ::prost::alloc::vec::Vec, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct StatCounters { #[prost(int32, optional, tag = "1")] pub network_proto: ::core::option::Option,