diff --git a/.ruby-version b/.ruby-version index b2eb3147..f967d3c1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.3 \ No newline at end of file +ruby-2.5.5 \ No newline at end of file diff --git a/.version b/.version index 132c6def..4ac4fded 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -6.1.1 \ No newline at end of file +6.2.0 \ No newline at end of file diff --git a/.version_code b/.version_code index f64269e4..dd474ccb 100644 --- a/.version_code +++ b/.version_code @@ -1 +1 @@ -6010100 \ No newline at end of file +6020000 \ No newline at end of file diff --git a/Brewfile b/Brewfile deleted file mode 100644 index 092c2c00..00000000 --- a/Brewfile +++ /dev/null @@ -1,2 +0,0 @@ -brew "Carthage" -brew "Swiftlint" diff --git a/CHANGELOG.md b/CHANGELOG.md index cc311364..1708c1d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,22 @@ ### NEXT_VERSION_DESCRIPTION_BEGIN ### NEXT_VERSION_DESCRIPTION_END +## [6.2.3] (04-08-2021) + +* исправления для CI + +## [6.2.2] (03-08-2021) + +* исправления для CI + +## [6.2.1] (03-08-2021) + +* исправления для CI + +## [6.2.0] (02-08-2021) + +* Добавлена возможность оплаты картами МИР в apple pay + ### 6.1.0 1. Добавили возможность создавать платежный токен для рекуррентных платежей в Apple Pay. @@ -181,4 +197,4 @@ 7. Добавили возможность логировать запросы. 8. Исправили UI баги. 9. Изменили процесс 3DS. -10. Доработали публичный API библиотеки. +10. Доработали публичный API библиотеки. \ No newline at end of file diff --git a/Gemfile b/Gemfile deleted file mode 100644 index ba44e592..00000000 --- a/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source "https://rubygems.org" - -gem 'cocoapods', '~> 1.10.0' -gem 'fastlane' -gem 'jazzy' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 360358b3..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,264 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.2) - activesupport (5.2.4.4) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) - atomos (0.1.3) - aws-eventstream (1.1.0) - aws-partitions (1.392.0) - aws-sdk-core (3.109.2) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.39.0) - aws-sdk-core (~> 3, >= 3.109.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.84.1) - aws-sdk-core (~> 3, >= 3.109.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.2) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - claide (1.0.3) - cocoapods (1.10.0) - addressable (~> 2.6) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.6.6) - nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.0) - activesupport (> 5.0, < 6) - addressable (~> 2.6) - algoliasearch (~> 1.0) - concurrent-ruby (~> 1.1) - fuzzy_match (~> 2.0.4) - nap (~> 1.0) - netrc (~> 0.11) - public_suffix - typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.4.0) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.0) - cocoapods-trunk (1.5.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.2.0) - colored (1.2) - colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) - concurrent-ruby (1.1.7) - declarative (0.0.20) - declarative-option (0.1.0) - digest-crc (0.6.1) - rake (~> 13.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.2.1) - escape (0.0.4) - ethon (0.12.0) - ffi (>= 1.3.0) - excon (0.78.0) - faraday (1.1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday_middleware (1.0.0) - faraday (~> 1.0) - fastimage (2.2.0) - fastlane (2.166.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored - commander-fastlane (>= 4.4.6, < 5.0.0) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) - simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) - ffi (1.13.1) - fourflusher (2.3.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.3) - google-api-client (0.38.0) - addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-cloud-core (1.5.0) - google-cloud-env (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-env (1.4.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.0.1) - google-cloud-storage (1.29.1) - addressable (~> 2.5) - digest-crc (~> 0.4) - google-api-client (~> 0.33) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) - mini_mime (~> 1.0) - googleauth (0.14.0) - faraday (>= 0.17.3, < 2.0) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) - domain_name (~> 0.5) - httpclient (2.8.3) - i18n (1.8.5) - concurrent-ruby (~> 1.0) - jazzy (0.13.6) - cocoapods (~> 1.5) - mustache (~> 1.1) - open4 - redcarpet (~> 3.4) - rouge (>= 2.0.6, < 4.0) - sassc (~> 2.1) - sqlite3 (~> 1.3) - xcinvoke (~> 0.3.0) - jmespath (1.4.0) - json (2.3.1) - jwt (2.2.2) - liferaft (0.0.6) - memoist (0.16.2) - mini_magick (4.11.0) - mini_mime (1.0.2) - minitest (5.14.2) - molinillo (0.6.6) - multi_json (1.15.0) - multipart-post (2.0.0) - mustache (1.1.1) - nanaimo (0.3.0) - nap (1.1.0) - naturally (2.2.0) - netrc (0.11.0) - open4 (1.3.4) - os (1.1.1) - plist (3.5.0) - public_suffix (4.0.6) - rake (13.0.1) - redcarpet (3.5.1) - representable (3.0.4) - declarative (< 0.1.0) - declarative-option (< 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rouge (2.0.7) - ruby-macho (1.4.0) - ruby2_keywords (0.0.2) - rubyzip (2.3.0) - sassc (2.4.0) - ffi (~> 1.9) - security (0.1.3) - signet (0.14.0) - addressable (~> 2.3) - faraday (>= 0.17.3, < 2.0) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.8) - CFPropertyList - naturally - slack-notifier (2.3.2) - sqlite3 (1.4.2) - terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - tty-cursor (0.7.1) - tty-screen (0.8.1) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - typhoeus (1.4.0) - ethon (>= 0.9.0) - tzinfo (1.2.8) - thread_safe (~> 0.1) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - word_wrap (1.0.0) - xcinvoke (0.3.0) - liferaft (~> 0.0.6) - xcodeproj (1.19.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.0) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - cocoapods (~> 1.10.0) - fastlane - jazzy - -BUNDLED WITH - 1.17.3 diff --git a/Podfile.lock b/Podfile.lock index 61667e21..fc2a6dd0 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,7 +14,7 @@ PODS: - YandexMobileMetrica/Dynamic/Core (3.17.0) - YandexMobileMetrica/Dynamic/Crashes (3.17.0): - YandexMobileMetrica/Dynamic/Core - - YooKassaPayments (6.1.1): + - YooKassaPayments (6.2.3): - MoneyAuth (~> 2.34.1) - ThreatMetrixAdapter (~> 3.3.0) - YandexMobileMetrica/Dynamic (~> 3.0) @@ -62,7 +62,7 @@ SPEC CHECKSUMS: SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52 ThreatMetrixAdapter: 309bc3d0afff4706c882844203df6d3f89a6bf0c YandexMobileMetrica: 9e713c16bb6aca0ba63b84c8d7b8b86d32f4ecc4 - YooKassaPayments: 7437ff6af25e8466ac69b9b2e9200a8e38c75d0a + YooKassaPayments: be592e6c59983d42dc0673a7e5d018ec3557c626 YooKassaPaymentsApi: 50d9ff8a3e76f3aaf01efe5ff7dcd1b813635044 YooKassaWalletApi: c1916b692ad842ae04917a10ce66d6d2f971c653 YooMoneyCoreApi: d228ca30d6936bc81642988c93d26eba271261f8 diff --git a/YooKassaPayments.podspec b/YooKassaPayments.podspec index 49247a16..82681c2a 100644 --- a/YooKassaPayments.podspec +++ b/YooKassaPayments.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'YooKassaPayments' - s.version = '6.1.1' + s.version = '6.2.3' s.homepage = 'https://github.com/yoomoney/yookassa-payments-swift' s.license = { :type => "MIT", diff --git a/YooKassaPayments.xcodeproj/project.pbxproj b/YooKassaPayments.xcodeproj/project.pbxproj index 4188badf..6814ba59 100644 --- a/YooKassaPayments.xcodeproj/project.pbxproj +++ b/YooKassaPayments.xcodeproj/project.pbxproj @@ -400,6 +400,7 @@ 252982C326AEB3B500174692 /* YandexMobileMetricaCrashes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = YandexMobileMetricaCrashes.xcframework; path = Carthage/Build/YandexMobileMetricaCrashes.xcframework; sourceTree = ""; }; 252982C626AEB6A800174692 /* ThreatMetrixAdapter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ThreatMetrixAdapter.xcframework; path = Carthage/Build/ThreatMetrixAdapter.xcframework; sourceTree = ""; }; 252982C826AEB70300174692 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/System/iOSSupport/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 25CD87AF26B90641002F4769 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = ""; }; 3089EF4823846F6300CB7319 /* SwitcherSavePaymentMethodViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitcherSavePaymentMethodViewModel.swift; sourceTree = ""; }; 3089EF4A23846F6C00CB7319 /* StrictSavePaymentMethodViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StrictSavePaymentMethodViewModel.swift; sourceTree = ""; }; 3089EF4C23846F7400CB7319 /* SavePaymentMethodViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SavePaymentMethodViewModel.swift; sourceTree = ""; }; @@ -822,6 +823,7 @@ 244F7DBFA2001569FCDC990C = { isa = PBXGroup; children = ( + 25CD87AF26B90641002F4769 /* CHANGELOG.md */, 252982AF26AE928C00174692 /* Cartfile */, 559073AD1FF3CE910094AE5D /* Gemfile */, 244F7901F30CDE5EFC8637D7 /* Podfile */, diff --git a/YooKassaPayments.xcodeproj/xcshareddata/xcschemes/YCPayments.xcscheme b/YooKassaPayments.xcodeproj/xcshareddata/xcschemes/YooKassaPayments.xcscheme similarity index 100% rename from YooKassaPayments.xcodeproj/xcshareddata/xcschemes/YCPayments.xcscheme rename to YooKassaPayments.xcodeproj/xcshareddata/xcschemes/YooKassaPayments.xcscheme diff --git a/YooKassaPayments/Private/Modules/ApplePayContract/Presenter/ApplePayContractPresenter.swift b/YooKassaPayments/Private/Modules/ApplePayContract/Presenter/ApplePayContractPresenter.swift index c66ef4af..6e798057 100644 --- a/YooKassaPayments/Private/Modules/ApplePayContract/Presenter/ApplePayContractPresenter.swift +++ b/YooKassaPayments/Private/Modules/ApplePayContract/Presenter/ApplePayContractPresenter.swift @@ -108,8 +108,8 @@ extension ApplePayContractPresenter: ApplePayContractViewOutput { func didTapOnSavePaymentMethod() { let savePaymentMethodModuleinputData = SavePaymentMethodInfoModuleInputData( - headerValue: SavePaymentMethodInfoLocalization.Wallet.header, - bodyValue: SavePaymentMethodInfoLocalization.Wallet.body + headerValue: SavePaymentMethodInfoLocalization.BankCard.header, + bodyValue: SavePaymentMethodInfoLocalization.BankCard.body ) router.presentSavePaymentMethodInfo( inputData: savePaymentMethodModuleinputData diff --git a/YooKassaPayments/Private/Services/ApplePay/ApplePayConstants.swift b/YooKassaPayments/Private/Services/ApplePay/ApplePayConstants.swift index 3befb43c..3e633489 100644 --- a/YooKassaPayments/Private/Services/ApplePay/ApplePayConstants.swift +++ b/YooKassaPayments/Private/Services/ApplePay/ApplePayConstants.swift @@ -1,9 +1,19 @@ -import struct PassKit.PKPaymentNetwork +import PassKit enum ApplePayConstants { - static let paymentNetworks: [PKPaymentNetwork] = [ - .amex, - .masterCard, - .visa, - ] + + static var paymentNetworks: [PKPaymentNetwork] { + var optional: [PKPaymentNetwork] = [] + if #available(iOS 14.5, *) { + /// TODO: Simplify when CI ready + if let mir = PKPaymentRequest.availableNetworks().first(where: { $0.rawValue == "Mir" }) { + optional.append(mir) + } + } + return optional + [ + .amex, + .masterCard, + .visa, + ] + } } diff --git a/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj b/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj index 2cf62317..ce999457 100644 --- a/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj +++ b/YooKassaPaymentsDemoApp.xcodeproj/project.pbxproj @@ -627,6 +627,8 @@ TargetAttributes = { 309BD415265CE9FA00D4804D = { CreatedOnToolsVersion = 12.5; + DevelopmentTeam = 2752592HU5; + ProvisioningStyle = Manual; }; }; }; @@ -998,8 +1000,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = YooKassaPaymentsDemoApp/Resources/YooKassaPaymentsDemoApp.entitlements; + CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 2752592HU5; INFOPLIST_FILE = YooKassaPaymentsDemoApp/Resources/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1009,7 +1012,8 @@ MARKETING_VERSION = 6.1; PRODUCT_BUNDLE_IDENTIFIER = ru.yoo.sdk.kassa.payments.example.adhoc; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = "YooKassa SDK Payments Example AdHoc"; SWIFT_OBJC_BRIDGING_HEADER = "YooKassaPaymentsDemoApp/Source/Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/YooKassaPaymentsDemoApp/Resources/Info.plist b/YooKassaPaymentsDemoApp/Resources/Info.plist index e6e8bb6e..8d7bfbc2 100644 --- a/YooKassaPaymentsDemoApp/Resources/Info.plist +++ b/YooKassaPaymentsDemoApp/Resources/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - $(MARKETING_VERSION) + 6.2.0 CFBundleURLTypes