Release 6.2.3

yoomoney · Aug 4, 2021 · f2e9a9c · f2e9a9c
1 parent a9f0d80
commit f2e9a9c
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 289 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.6.3
+ruby-2.5.5
diff --git a/.version b/.version
@@ -1 +1 @@
-6.1.1
+6.2.0
diff --git a/.version_code b/.version_code
@@ -1 +1 @@
-6010100
+6020000
diff --git a/Brewfile b/Brewfile
diff --git 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 библиотеки.
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git 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
@@ -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
@@ -400,6 +400,7 @@
 		252982C326AEB3B500174692 /* YandexMobileMetricaCrashes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = YandexMobileMetricaCrashes.xcframework; path = Carthage/Build/YandexMobileMetricaCrashes.xcframework; sourceTree = "<group>"; };
 		252982C626AEB6A800174692 /* ThreatMetrixAdapter.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ThreatMetrixAdapter.xcframework; path = Carthage/Build/ThreatMetrixAdapter.xcframework; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		3089EF4823846F6300CB7319 /* SwitcherSavePaymentMethodViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwitcherSavePaymentMethodViewModel.swift; sourceTree = "<group>"; };
 		3089EF4A23846F6C00CB7319 /* StrictSavePaymentMethodViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StrictSavePaymentMethodViewModel.swift; sourceTree = "<group>"; };
 		3089EF4C23846F7400CB7319 /* SavePaymentMethodViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SavePaymentMethodViewModel.swift; sourceTree = "<group>"; };
@@ -822,6 +823,7 @@
 		244F7DBFA2001569FCDC990C = {
 			isa = PBXGroup;
 			children = (
+				25CD87AF26B90641002F4769 /* CHANGELOG.md */,
 				252982AF26AE928C00174692 /* Cartfile */,
 				559073AD1FF3CE910094AE5D /* Gemfile */,
 				244F7901F30CDE5EFC8637D7 /* Podfile */,

diff --git a/...cshareddata/xcschemes/YCPayments.xcscheme → ...ddata/xcschemes/YooKassaPayments.xcscheme b/...cshareddata/xcschemes/YCPayments.xcscheme → ...ddata/xcschemes/YooKassaPayments.xcscheme
diff --git 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
@@ -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,
+        ]
+    }
 }