Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master #1633

Merged
merged 8 commits into from
Aug 16, 2023
Merged

Merge master #1633

merged 8 commits into from
Aug 16, 2023

Conversation

pakrym-stripe
Copy link
Contributor

No description provided.

stripe-openapi bot and others added 7 commits August 10, 2023 17:07
Co-authored-by: Stripe OpenAPI <105521251+stripe-openapi[bot]@users.noreply.github.com>
* Update generated code for v466

* remove deprecated field usages in tests

---------

Co-authored-by: Stripe OpenAPI <105521251+stripe-openapi[bot]@users.noreply.github.com>
Co-authored-by: Pavel Krymets <[email protected]>
# Conflicts:
#	CHANGELOG.md
#	OPENAPI_VERSION
#	README.md
#	VERSION
#	gradle.properties
#	src/main/java/com/stripe/ApiVersion.java
#	src/main/java/com/stripe/Stripe.java
#	src/main/java/com/stripe/model/Account.java
#	src/main/java/com/stripe/model/ApplePayDomain.java
#	src/main/java/com/stripe/model/ApplicationFee.java
#	src/main/java/com/stripe/model/BalanceTransaction.java
#	src/main/java/com/stripe/model/CapabilityCollection.java
#	src/main/java/com/stripe/model/Charge.java
#	src/main/java/com/stripe/model/CountrySpec.java
#	src/main/java/com/stripe/model/Coupon.java
#	src/main/java/com/stripe/model/CreditNote.java
#	src/main/java/com/stripe/model/CreditNoteLineItemCollection.java
#	src/main/java/com/stripe/model/Customer.java
#	src/main/java/com/stripe/model/CustomerBalanceTransactionCollection.java
#	src/main/java/com/stripe/model/CustomerCashBalanceTransactionCollection.java
#	src/main/java/com/stripe/model/Dispute.java
#	src/main/java/com/stripe/model/Event.java
#	src/main/java/com/stripe/model/ExchangeRate.java
#	src/main/java/com/stripe/model/ExternalAccountCollection.java
#	src/main/java/com/stripe/model/FeeRefundCollection.java
#	src/main/java/com/stripe/model/File.java
#	src/main/java/com/stripe/model/FileLink.java
#	src/main/java/com/stripe/model/Invoice.java
#	src/main/java/com/stripe/model/InvoiceItem.java
#	src/main/java/com/stripe/model/InvoiceLineItemCollection.java
#	src/main/java/com/stripe/model/PaymentIntent.java
#	src/main/java/com/stripe/model/PaymentLink.java
#	src/main/java/com/stripe/model/PaymentMethod.java
#	src/main/java/com/stripe/model/PaymentSourceCollection.java
#	src/main/java/com/stripe/model/Payout.java
#	src/main/java/com/stripe/model/PersonCollection.java
#	src/main/java/com/stripe/model/Plan.java
#	src/main/java/com/stripe/model/Price.java
#	src/main/java/com/stripe/model/Product.java
#	src/main/java/com/stripe/model/PromotionCode.java
#	src/main/java/com/stripe/model/Quote.java
#	src/main/java/com/stripe/model/Refund.java
#	src/main/java/com/stripe/model/RefundCollection.java
#	src/main/java/com/stripe/model/Review.java
#	src/main/java/com/stripe/model/SetupAttempt.java
#	src/main/java/com/stripe/model/SetupIntent.java
#	src/main/java/com/stripe/model/ShippingRate.java
#	src/main/java/com/stripe/model/Source.java
#	src/main/java/com/stripe/model/Subscription.java
#	src/main/java/com/stripe/model/SubscriptionItem.java
#	src/main/java/com/stripe/model/SubscriptionSchedule.java
#	src/main/java/com/stripe/model/TaxCode.java
#	src/main/java/com/stripe/model/TaxIdCollection.java
#	src/main/java/com/stripe/model/TaxRate.java
#	src/main/java/com/stripe/model/Topup.java
#	src/main/java/com/stripe/model/Transfer.java
#	src/main/java/com/stripe/model/TransferReversalCollection.java
#	src/main/java/com/stripe/model/WebhookEndpoint.java
#	src/main/java/com/stripe/model/apps/Secret.java
#	src/main/java/com/stripe/model/billingportal/Configuration.java
#	src/main/java/com/stripe/model/checkout/Session.java
#	src/main/java/com/stripe/model/financialconnections/Account.java
#	src/main/java/com/stripe/model/financialconnections/Session.java
#	src/main/java/com/stripe/model/identity/VerificationReport.java
#	src/main/java/com/stripe/model/identity/VerificationSession.java
#	src/main/java/com/stripe/model/issuing/Authorization.java
#	src/main/java/com/stripe/model/issuing/Card.java
#	src/main/java/com/stripe/model/issuing/Cardholder.java
#	src/main/java/com/stripe/model/issuing/Dispute.java
#	src/main/java/com/stripe/model/issuing/Transaction.java
#	src/main/java/com/stripe/model/radar/EarlyFraudWarning.java
#	src/main/java/com/stripe/model/radar/ValueList.java
#	src/main/java/com/stripe/model/radar/ValueListItem.java
#	src/main/java/com/stripe/model/reporting/ReportRun.java
#	src/main/java/com/stripe/model/reporting/ReportType.java
#	src/main/java/com/stripe/model/sigma/ScheduledQueryRun.java
#	src/main/java/com/stripe/model/tax/Calculation.java
#	src/main/java/com/stripe/model/tax/Transaction.java
#	src/main/java/com/stripe/model/terminal/Configuration.java
#	src/main/java/com/stripe/model/terminal/Location.java
#	src/main/java/com/stripe/model/terminal/Reader.java
#	src/main/java/com/stripe/model/testhelpers/TestClock.java
#	src/main/java/com/stripe/model/treasury/CreditReversal.java
#	src/main/java/com/stripe/model/treasury/DebitReversal.java
#	src/main/java/com/stripe/model/treasury/FinancialAccount.java
#	src/main/java/com/stripe/model/treasury/InboundTransfer.java
#	src/main/java/com/stripe/model/treasury/OutboundPayment.java
#	src/main/java/com/stripe/model/treasury/OutboundTransfer.java
#	src/main/java/com/stripe/model/treasury/ReceivedCredit.java
#	src/main/java/com/stripe/model/treasury/ReceivedDebit.java
#	src/main/java/com/stripe/model/treasury/Transaction.java
#	src/main/java/com/stripe/model/treasury/TransactionEntry.java
#	src/main/java/com/stripe/net/ApiResource.java
#	src/main/java/com/stripe/net/LiveStripeResponseGetter.java
#	src/main/java/com/stripe/net/RequestOptions.java
#	src/main/java/com/stripe/net/StripeResponseGetter.java
#	src/main/java/com/stripe/param/PriceUpdateParams.java
#	src/main/java/com/stripe/param/SubscriptionScheduleCreateParams.java
#	src/test/java/com/stripe/net/RequestOptionsTest.java
#	src/test/java/com/stripe/net/StripeRequestTest.java
@pakrym-stripe pakrym-stripe changed the base branch from master to beta August 16, 2023 23:02
# Conflicts:
#	CHANGELOG.md
#	OPENAPI_VERSION
#	README.md
#	VERSION
#	gradle.properties
#	src/main/java/com/stripe/Stripe.java
@pakrym-stripe pakrym-stripe merged commit 590aaee into beta Aug 16, 2023
13 checks passed
@remi-stripe remi-stripe deleted the merge-upstream branch September 28, 2023 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants