Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into development
# Conflicts: # OSPaymentsLib.xcodeproj/project.pbxproj # OSPaymentsLib.xcodeproj/xcshareddata/xcschemes/OSPaymentsLib.xcscheme # OSPaymentsLib.xcworkspace/xcshareddata/swiftpm/Package.resolved # OSPaymentsLib/Protocols/OSPMTRequestDelegate.swift # OSPaymentsLibTests/ModelSpecs/OSPMTAddressModelSpec.swift # OSPaymentsLibTests/ModelSpecs/OSPMTContactInfoModelSpec.swift # OSPaymentsLibTests/ModelSpecs/OSPMTDataModelSpec.swift # OSPaymentsLibTests/ModelSpecs/OSPMTScopeModelSpec.swift # OSPaymentsLibTests/ModelSpecs/OSPMTTokenInfoModelSpec.swift # OSPaymentsLibTests/OSPMTApplePayAvailabilityBehaviourSpec.swift # OSPaymentsLibTests/OSPMTApplePayConfigurationSpec.swift # OSPaymentsLibTests/OSPMTApplePayHandlerSpec.swift # OSPaymentsLibTests/OSPMTApplePayRequestBehaviourSpec.swift # OSPaymentsLibTests/OSPMTGatewayFactorySpec.swift # OSPaymentsLibTests/OSPMTPaymentsSpec.swift # OSPaymentsLibTests/OSPMTStripeWrapperSpec.swift # Podfile # Pods/Manifest.lock # Pods/Nimble/README.md # Pods/Nimble/Sources/Nimble/Adapters/AssertionRecorder.swift # Pods/Nimble/Sources/Nimble/Adapters/NMBExpectation.swift # Pods/Nimble/Sources/Nimble/Adapters/NimbleEnvironment.swift # Pods/Nimble/Sources/Nimble/Adapters/NimbleXCTestHandler.swift # Pods/Nimble/Sources/Nimble/DSL+Wait.swift # Pods/Nimble/Sources/Nimble/DSL.swift # Pods/Nimble/Sources/Nimble/Expectation.swift # Pods/Nimble/Sources/Nimble/Expression.swift # Pods/Nimble/Sources/Nimble/FailureMessage.swift # Pods/Nimble/Sources/Nimble/Matchers/AllPass.swift # Pods/Nimble/Sources/Nimble/Matchers/BeAKindOf.swift # Pods/Nimble/Sources/Nimble/Matchers/BeAnInstanceOf.swift # Pods/Nimble/Sources/Nimble/Matchers/BeCloseTo.swift # Pods/Nimble/Sources/Nimble/Matchers/BeEmpty.swift # Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThan.swift # Pods/Nimble/Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift # Pods/Nimble/Sources/Nimble/Matchers/BeIdenticalTo.swift # Pods/Nimble/Sources/Nimble/Matchers/BeLessThan.swift # Pods/Nimble/Sources/Nimble/Matchers/BeLessThanOrEqual.swift # Pods/Nimble/Sources/Nimble/Matchers/BeLogical.swift # Pods/Nimble/Sources/Nimble/Matchers/BeNil.swift # Pods/Nimble/Sources/Nimble/Matchers/BeResult.swift # Pods/Nimble/Sources/Nimble/Matchers/BeVoid.swift # Pods/Nimble/Sources/Nimble/Matchers/BeWithin.swift # Pods/Nimble/Sources/Nimble/Matchers/BeginWith.swift # Pods/Nimble/Sources/Nimble/Matchers/BeginWithPrefix.swift # Pods/Nimble/Sources/Nimble/Matchers/Contain.swift # Pods/Nimble/Sources/Nimble/Matchers/ContainElementSatisfying.swift # Pods/Nimble/Sources/Nimble/Matchers/ElementsEqual.swift # Pods/Nimble/Sources/Nimble/Matchers/EndWith.swift # Pods/Nimble/Sources/Nimble/Matchers/Equal+Tuple.swift # Pods/Nimble/Sources/Nimble/Matchers/Equal.swift # Pods/Nimble/Sources/Nimble/Matchers/HaveCount.swift # Pods/Nimble/Sources/Nimble/Matchers/Match.swift # Pods/Nimble/Sources/Nimble/Matchers/MatchError.swift # Pods/Nimble/Sources/Nimble/Matchers/PostNotification.swift # Pods/Nimble/Sources/Nimble/Matchers/RaisesException.swift # Pods/Nimble/Sources/Nimble/Matchers/SatisfyAllOf.swift # Pods/Nimble/Sources/Nimble/Matchers/SatisfyAnyOf.swift # Pods/Nimble/Sources/Nimble/Matchers/ThrowAssertion.swift # Pods/Nimble/Sources/Nimble/Matchers/ThrowError.swift # Pods/Nimble/Sources/Nimble/Matchers/ToSucceed.swift # Pods/Nimble/Sources/Nimble/Nimble.h # Pods/Nimble/Sources/Nimble/Utils/SourceLocation.swift # Pods/Nimble/Sources/NimbleObjectiveC/DSL.m # Pods/Nimble/Sources/NimbleObjectiveC/NMBStringify.m # Pods/Nimble/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m # Pods/Pods.xcodeproj/project.pbxproj # Pods/Quick/README.md # Pods/Quick/Sources/Quick/Callsite.swift # Pods/Quick/Sources/Quick/Configuration/QCKConfiguration.swift # Pods/Quick/Sources/Quick/Configuration/QuickConfiguration.swift # Pods/Quick/Sources/Quick/DSL/DSL.swift # Pods/Quick/Sources/Quick/DSL/World+DSL.swift # Pods/Quick/Sources/Quick/ExampleGroup.swift # Pods/Quick/Sources/Quick/Filter.swift # Pods/Quick/Sources/Quick/Hooks/Closures.swift # Pods/Quick/Sources/Quick/Hooks/ExampleHooks.swift # Pods/Quick/Sources/Quick/Hooks/SuiteHooks.swift # Pods/Quick/Sources/Quick/QuickTestObservation.swift # Pods/Quick/Sources/Quick/World.swift # Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.h # Pods/Quick/Sources/QuickObjectiveC/DSL/QCKDSL.m # Pods/Quick/Sources/QuickObjectiveC/QuickSpec.h # Pods/Quick/Sources/QuickObjectiveC/QuickSpec.m # Pods/Target Support Files/Nimble/Nimble-Info.plist # Pods/Target Support Files/Nimble/Nimble-umbrella.h # Pods/Target Support Files/Nimble/Nimble.debug.xcconfig # Pods/Target Support Files/Nimble/Nimble.release.xcconfig # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-Info.plist # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-acknowledgements.markdown # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-acknowledgements.plist # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-frameworks-Debug-input-files.xcfilelist # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-frameworks-Debug-output-files.xcfilelist # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-frameworks-Release-input-files.xcfilelist # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-frameworks-Release-output-files.xcfilelist # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests-frameworks.sh # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests.debug.xcconfig # Pods/Target Support Files/Pods-OSPaymentsLib-OSPaymentsLibTests/Pods-OSPaymentsLib-OSPaymentsLibTests.release.xcconfig # Pods/Target Support Files/Pods-OSPaymentsLib/Pods-OSPaymentsLib-Info.plist # Pods/Target Support Files/Quick/Quick-Info.plist # Pods/Target Support Files/Quick/Quick.debug.xcconfig # Pods/Target Support Files/Quick/Quick.release.xcconfig # build.sh # docs/CHANGELOG.md
- Loading branch information