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

Release 4.0.4: Bring latest release changes to main #373

Merged
merged 28 commits into from Jan 12, 2023

Conversation

melting-snowman
Copy link
Contributor

Proposed changes

Bring the missing changes from 4.0.4 release branch back into main:

  • Changelog
  • version update
  • API key changes
  • using String instead of enum for scheme returns

melting-snowman and others added 28 commits December 21, 2022 10:06
…elease

Release 4.0.4: Pass UserCancelled in completion handler
Release 4.0.4: Do not parse network response for scheme
Merge branch 'alex/minorImprovements' into alex/minorImprovementsCarryFromRelease4.0.4

# Conflicts:
#	Checkout/Checkout/Source/Model/TokenDetails.swift
#	Checkout/Checkout/Source/Tokenisation/TokenDetailsFactory.swift
#	CheckoutTests/Stubs/StubProvider.swift
#	CheckoutTests/Tokenisation/TokenDetailsFactoryTests.swift
#	Tests/Mocks/StubCheckoutAPIService.swift
…4.0.4

Release 4.0.4: Update ReadMe & sample app
@deepesh-vasthimal-cko
Copy link
Contributor

Going forward we should try to release from main so we can may be avoid the housekeeping from other branches.

@melting-snowman melting-snowman merged commit 68e08aa into main Jan 12, 2023
@melting-snowman melting-snowman deleted the alex/minorImprovementsCarryFromRelease4.0.4 branch January 12, 2023 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants