diff --git a/.gitignore b/.gitignore index 0d381c7..26d48b8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ build/ *.iml Flutter/Generated.xcconfig Flutter/flutter_export_environment.sh +.bundle/ +fastlane/ .idea/* !.idea/codeStyles/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 25146cc..03de2d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ ### NEXT_VERSION_DESCRIPTION_BEGIN ### NEXT_VERSION_DESCRIPTION_END +## [1.4.0] (27-04-2024) + +* Android changes: update dependencies - java 17, kotlin 1.9.22, AGP 8.2.2, min sdk version raised to 24, update native version MSDK to 6.11.0, documentation updates. iOS changes: min iOS version up to 14, update native version MSDK to 6.16.0 with privacy manifest + +## [1.3.1] (26-03-2024) + +* Added Jenkinsfile + ## [1.3.0] (22-12-2023) * Update payment method via Sber diff --git a/README.md b/README.md index 5f94bdb..2722dcb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ # YooKassa Payments SDK +[![Version](https://img.shields.io/pub/v/yookassa_payments_flutter)](https://pub.dev/packages/yookassa_payments_flutter) +![Version](https://img.shields.io/badge/minSdkVersion-24-blue) +![Version](https://img.shields.io/badge/AGP-8.2.2-blue) +![Version](https://img.shields.io/badge/Java-17-blue) +![Version](https://img.shields.io/badge/Kotlin-1.9.22-blue) +![Version](https://img.shields.io/badge/iOS-14.0-orange) Библиотека позволяет встроить прием платежей в мобильные приложения на Flutter и работает как дополнение к API ЮKassa.\ В мобильный SDK входят готовые платежные интерфейсы (форма оплаты и всё, что с ней связано).\ @@ -85,7 +91,7 @@ source 'https://git.yoomoney.ru/scm/sdk/cocoa-pod-specs.git' ```dart var clientApplicationKey = "<Ключ для клиентских приложений>"; -var amount = Amount(value: 999.9, currency: Currency.rub); +var amount = Amount(value: "999.9", currency: Currency.rub); var shopId = "<Идентификатор магазина в ЮKassa)>"; var tokenizationModuleInputData = TokenizationModuleInputData(clientApplicationKey: clientApplicationKey, @@ -622,7 +628,7 @@ func didFinishConfirmation(paymentMethodType: PaymentMethodType) { 1. Сконфигурировать объект с типом `TestModeSettings(paymentAuthorizationPassed, cardsCount, charge, enablePaymentError)`. ```dart -var testModeSettings = TestModeSettings(true, 5, Amount(value: 999, currency: .rub), false); +var testModeSettings = TestModeSettings(true, 5, Amount(value: "999", currency: Currency.rub), false); ``` 2. Передать его в `TokenizationModuleInputData` в параметре `testModeSettings:` diff --git a/Sberpay via SberSDK.md b/Sberpay via SberSDK.md deleted file mode 100644 index 73806b8..0000000 --- a/Sberpay via SberSDK.md +++ /dev/null @@ -1,229 +0,0 @@ -# Проведение платежа через SberSDK - -Функциональность доступна ограниченному кругу наших клиентов, так как находится в тестировании. Чтобы попасть в число ранних пользователей необходимо связаться со своим менеджером и запросить доступ. - -- [Настройка оплаты через SberPay с нуля](#чистая-настройка) -- [Переход со старой версии SberPay](#переход-на-новую-версию) - -С помощью SDK можно провести и подтвердить платеж через актуальное приложение Сбербанка, если оно установленно, иначе с подтверждением по смс. - -## Настройка оплаты через SberPay с нуля - -(!) Далее описание настройки метода `SberPay`, если ранее вы его не использовали. - -В `TokenizationModuleInputData` необходимо передавать `applicationScheme` – схема для возврата в приложение после успешной оплаты с помощью `SberPay` в приложении Сбербанка. - -Пример `applicationScheme`: - -```dart -let tokenizationModuleInputData = TokenizationModuleInputData( - ... - applicationScheme: "examplescheme://" -``` - -## Чтобы провести платёж: - -### 1. При создании `TokenizationModuleInputData` передайте значение `PaymentMethod.sberbank` в `tokenizationSettings`. - -```dart -var tokenizationSettings = const TokenizationSettings(PaymentMethodTypes([ - PaymentMethod.sberbank -])); - -var tokenizationModuleInputData = - TokenizationModuleInputData(clientApplicationKey: "<Ключ для клиентских приложений>", - title: "Космические объекты", - subtitle: "Комета повышенной яркости, период обращения — 112 лет", - amount: Amount(value: 999.9, currency: Currency.rub), - shopId: "<Идентификатор магазина в ЮKassa)>", - savePaymentMethod: SavePaymentMethod.on, - tokenizationSettings: tokenizationSettings); -``` - -### 2. Запустите процесс токенизации, передав TokenizationModuleInputData - -```dart -var result = await YookassaPaymentsFlutter.tokenization(tokenizationModuleInputData); -``` - -### 3. Получите токен - -```dart -var result = await YookassaPaymentsFlutter.tokenization(tokenizationModuleInputData); -if (result is SuccessTokenizationResult) { - var token = result.token; - var paymentMethodType = result.paymentMethodType; -} else if (result is ErrorTokenizationResult) { - // обработайте ошибку -} -``` - -### 4. [Создайте платеж](https://yookassa.ru/developers/api#create_payment) с токеном по API ЮKassa. - -## Для подтверждения платежа через приложение Сбербанка: - -### 1. Добавьте уникальную схему диплинка - -Для **iOS** в `Info.plist` добавьте следующие строки: - -```plistbase -CFBundleURLTypes - - - CFBundleTypeRole - Editor - CFBundleURLName - ${BUNDLE_ID} - CFBundleURLSchemes - - examplescheme - - - -``` - -Для **android** в ваш файл build.gradle в блок android.defaultConfig добавьте строку - -``` -android { - defaultConfig { - resValue "string", "ym_app_scheme", "exampleapp" - } -} -``` -или добавить в ваш strings.xml строку вида: -``` - - exampleapp - -``` - -где `examplescheme` - схема для открытия вашего приложения, которую вы указали в `applicationScheme` при создании `TokenizationModuleInputData`. Через эту схему будет открываться ваше приложение после успешной оплаты с помощью `SberPay`. - -### 2. Для android подключите библиотеку профилирования формата .aar - -Попросите у менеджера по подключению библиотеку профилирования формата .aar. Создайте папку libs в модуле где подключаете sdk и добавьте туда файл aar-файл. В build.gradle того же модуля в dependencies добавьте: -```groovy -dependencies { - implementation fileTree(dir: "libs", include: ["*.aar"]) -} -``` - -### 3. Добавить в `Info.plist` новые схемы для обращения в сервисам Сбера - -``` -LSApplicationQueriesSchemes - - sbolidexternallogin - sberbankidexternallogin - -``` - -и расширенные настройки для http-соединений к сервисам Сбера - -``` -NSAppTransportSecurity - - NSExceptionDomains - - gate1.spaymentsplus.ru - - NSExceptionAllowsInsecureHTTPLoads - - - ift.gate2.spaymentsplus.ru - - NSExceptionAllowsInsecureHTTPLoads - - - cms-res.online.sberbank.ru - - NSExceptionAllowsInsecureHTTPLoads - - - - -``` - -### 4. Подтверждение платежа. При необходимости система может запросить процесс подтверждения платежа, при котором пользователь подтверждает транзакцию с помощью сервисов Сбера. Ссылку вы получаете от бекенда Кассы после проведения платежа на шаге 4. - -```dart -var clientApplicationKey = "<Ключ для клиентских приложений>"; -var shopId = "<Идентификатор магазина в ЮKassa)>"; - -await YookassaPaymentsFlutter.confirmation(confirmationUrl, PaymentMethod.sbp, clientApplicationKey, shopId); -// обработайте результат подтверждения на следущей строке (после возврата управления) -``` -Завершение процесса `YookassaPaymentsFlutter.confirmation` не несет информацию о том, что пользователь фактически подтвердил платеж (он мог его пропустить). После получения результата рекомендуем запросить статус платежа. - - - -## Переход на новую версию SberPay - -(!) Далее описание настройки новой версии метода `SberPay`, если ранее вы его уже использовали. - -Сценарий оплаты через `Sberpay` теперь происходит не в мобильном приложения, а через встроенное Sber SDK. - -### Список изменений для android: - -Попросите у менеджера по подключению библиотеку формата `.aar`. - Создайте папку libs в модуле где подключаете sdk и добавьте туда файл `B.aar`. В build.gradle того же модуля в dependencies добавьте: -```groovy -dependencies { - implementation fileTree(dir: "libs", include: ["*.aar"]) -} -``` - -Также необходимо в метод `YookassaPaymentsFlutter.confirmation` передать параметр `clientApplicationKey` - ключ для клиентских приложений из личного кабинета ЮKassa ([раздел Настройки — Ключи API](https://yookassa.ru/my/api-keys-settings)); - -```dart -var clientApplicationKey = "<Ключ для клиентских приложений>"; -var shopId = "<Идентификатор магазина в ЮKassa)>"; - -await YookassaPaymentsFlutter.confirmation(confirmationUrl, PaymentMethod.sbp, clientApplicationKey, shopId); -``` - -### Список изменений для iOS: - -1. В вашем файле `Info.plist` заменить схему для обращений в сервисам Сбера - -``` -LSApplicationQueriesSchemes - - sberpay - -``` -на обновленную версию -``` -LSApplicationQueriesSchemes - - sbolidexternallogin - sberbankidexternallogin - -``` - -2. Добавить расширенные настройки для http-соединений к сервисам Сбера - -``` -NSAppTransportSecurity - - NSExceptionDomains - - gate1.spaymentsplus.ru - - NSExceptionAllowsInsecureHTTPLoads - - - ift.gate2.spaymentsplus.ru - - NSExceptionAllowsInsecureHTTPLoads - - - cms-res.online.sberbank.ru - - NSExceptionAllowsInsecureHTTPLoads - - - - -``` diff --git a/android/build.gradle b/android/build.gradle index 07f65cc..b770936 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,14 +1,14 @@ group 'ru.yoomoney.sdk.kassa.payments.flutter' buildscript { - ext.kotlin_version = '1.8.22' + ext.kotlin_version = '1.9.22' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -24,15 +24,16 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { + namespace "ru.yoomoney.sdk.kassa.payments.flutter" compileSdkVersion 33 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } sourceSets { @@ -40,7 +41,7 @@ android { } defaultConfig { - minSdkVersion 21 + minSdkVersion 24 } buildTypes { @@ -51,10 +52,9 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'ru.yoomoney.sdk.kassa.payments:yookassa-android-sdk:6.9.2' + implementation 'ru.yoomoney.sdk.kassa.payments:yookassa-android-sdk:6.11.0' } configurations.implementation { exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' -} +} \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 0e9a610..caae48e 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://nexus.yooteam.ru/content/repositories/http-proxy-services.gradle.org/distributions/gradle-8.5-all.zip diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 3d04f6a..dac67c9 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/android/src/main/kotlin/ru/yoomoney/sdk/kassa/payments/flutter/YookassaPaymentsFlutterPlugin.kt b/android/src/main/kotlin/ru/yoomoney/sdk/kassa/payments/flutter/YookassaPaymentsFlutterPlugin.kt index 65f963c..32dc77d 100644 --- a/android/src/main/kotlin/ru/yoomoney/sdk/kassa/payments/flutter/YookassaPaymentsFlutterPlugin.kt +++ b/android/src/main/kotlin/ru/yoomoney/sdk/kassa/payments/flutter/YookassaPaymentsFlutterPlugin.kt @@ -308,7 +308,7 @@ private fun MockConfiguration(data: Map): MockConfiguration? { val completeWithError = testModeSettings["enablePaymentError"] as Boolean val linkedCardsCount = testModeSettings["cardsCount"] as Int val serviceFeeMap: HashMap = testModeSettings["charge"] as HashMap - val serviceFee = Amount(BigDecimal(serviceFeeMap["value"] as Double), Currency.getInstance(serviceFeeMap["currency"] as String)) + val serviceFee = Amount(BigDecimal(serviceFeeMap["value"] as String), Currency.getInstance(serviceFeeMap["currency"] as String)) return MockConfiguration(completeWithError, paymentAuthPassed, linkedCardsCount, serviceFee) } \ No newline at end of file diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 1d3655f..fac8692 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,15 +26,16 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + namespace "ru.yoomoney.yookassa_payments_flutter_example" compileSdkVersion 33 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } sourceSets { @@ -44,7 +45,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "ru.yoomoney.yookassa_payments_flutter_example" - minSdkVersion 21 + minSdkVersion 24 targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -64,7 +65,3 @@ android { flutter { source '../..' } - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 4348684..688da78 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/example/android/build.gradle b/example/android/build.gradle index 38a0a82..4421b56 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.8.22' + ext.kotlin_version = '1.9.22' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.1' + classpath 'com.android.tools.build:gradle:8.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 4169f5c..2ac5547 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip \ No newline at end of file +distributionUrl=https\://nexus.yooteam.ru/content/repositories/http-proxy-services.gradle.org/distributions/gradle-8.5-all.zip \ No newline at end of file diff --git a/example/ios/Podfile b/example/ios/Podfile index 7f76492..623e9cc 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,4 +1,4 @@ -platform :ios, '13.0' +platform :ios, '14.0' source 'https://github.com/CocoaPods/Specs.git' source 'https://git.yoomoney.ru/scm/sdk/cocoa-pod-specs.git' @@ -42,7 +42,7 @@ post_install do |installer| target.build_configurations.each do |config| config.build_settings["ONLY_ACTIVE_ARCH"] = "YES" - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0' end end end diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index e207186..f85dd55 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,42 +1,102 @@ PODS: + - AppMetrica_FMDB (5.2.0) + - AppMetrica_Protobuf (5.2.0) + - AppMetricaAdSupport (5.2.0): + - AppMetricaCore (= 5.2.0) + - AppMetricaCoreExtension (= 5.2.0) + - AppMetricaAnalytics (5.2.0): + - AppMetricaAdSupport (= 5.2.0) + - AppMetricaCore (= 5.2.0) + - AppMetricaCrashes (= 5.2.0) + - AppMetricaWebKit (= 5.2.0) + - AppMetricaCore (5.2.0): + - AppMetrica_FMDB (= 5.2.0) + - AppMetrica_Protobuf (= 5.2.0) + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaEncodingUtils (= 5.2.0) + - AppMetricaHostState (= 5.2.0) + - AppMetricaLog (= 5.2.0) + - AppMetricaNetwork (= 5.2.0) + - AppMetricaPlatform (= 5.2.0) + - AppMetricaProtobufUtils (= 5.2.0) + - AppMetricaStorageUtils (= 5.2.0) + - AppMetricaCoreExtension (5.2.0): + - AppMetricaCore (= 5.2.0) + - AppMetricaStorageUtils (= 5.2.0) + - AppMetricaCoreUtils (5.2.0): + - AppMetricaLog (= 5.2.0) + - AppMetricaCrashes (5.2.0): + - AppMetricaCore (= 5.2.0) + - AppMetricaCoreExtension (= 5.2.0) + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaEncodingUtils (= 5.2.0) + - AppMetricaHostState (= 5.2.0) + - AppMetricaLog (= 5.2.0) + - AppMetricaPlatform (= 5.2.0) + - AppMetricaProtobufUtils (= 5.2.0) + - AppMetricaStorageUtils (= 5.2.0) + - KSCrash/Recording (= 1.17.0) + - KSCrash/Recording/Tools + - AppMetricaEncodingUtils (5.2.0): + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaLog (= 5.2.0) + - AppMetricaPlatform (= 5.2.0) + - AppMetricaHostState (5.2.0): + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaLog (= 5.2.0) + - AppMetricaLog (5.2.0) + - AppMetricaNetwork (5.2.0): + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaLog (= 5.2.0) + - AppMetricaPlatform (= 5.2.0) + - AppMetricaPlatform (5.2.0): + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaLog (= 5.2.0) + - AppMetricaProtobufUtils (5.2.0): + - AppMetrica_Protobuf (= 5.2.0) + - AppMetricaStorageUtils (5.2.0): + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaLog (= 5.2.0) + - AppMetricaWebKit (5.2.0): + - AppMetricaCore (= 5.2.0) + - AppMetricaCoreUtils (= 5.2.0) + - AppMetricaLog (= 5.2.0) - Flutter (1.0.0) - - FunctionalSwift (2.0.6) - - MobileSdk (2.0.0) - - MoneyAuth (10.2.1): + - FMobileSdk (2.0.0.1230) + - FunctionalSwift (2.0.7) + - KSCrash/Recording (1.17.0): + - KSCrash/Recording/Tools (= 1.17.0) + - KSCrash/Recording/Tools (1.17.0) + - MoneyAuth (10.13.0): + - FMobileSdk - FunctionalSwift (~> 2.0) - - YooMoneyCoreApi (~> 3.0) + - YooMoneyCoreApi (~> 3.1) - YooMoneySessionProfiler (~> 5.0) - - YooMoneyUI (~> 7.0) + - YooMoneyUI (~> 7.7) - SPaySDK (1.0.9) - - YandexMobileMetrica/Dynamic (4.5.2): - - YandexMobileMetrica/Dynamic/Core (= 4.5.2) - - YandexMobileMetrica/Dynamic/Crashes (= 4.5.2) - - YandexMobileMetrica/Dynamic/Core (4.5.2) - - YandexMobileMetrica/Dynamic/Crashes (4.5.2): - - YandexMobileMetrica/Dynamic/Core - - yookassa_payments_flutter (0.0.1): + - yookassa_payments_flutter (1.3.1): - Flutter - - YooKassaPayments (= 6.14.0) - - YooKassaPayments (6.14.0): - - MoneyAuth (~> 10.2.1) + - YooKassaPayments (= 6.16.0) + - YooKassaPayments (6.16.0): + - AppMetricaAnalytics (~> 5.2.0) + - MoneyAuth (~> 10.13.0) - SPaySDK (~> 1.0.8) - - YandexMobileMetrica/Dynamic (>= 3.0) - - YooKassaPaymentsApi (~> 2.21.2) - - YooKassaWalletApi (~> 2.3.1) - - YooMoneyCoreApi (~> 3.0) - - YooMoneySessionProfiler (~> 5.0.1) - - YooMoneyUI (~> 7.3.1) - - YooKassaPaymentsApi (2.21.3): + - YooKassaPaymentsApi (~> 2.22.0) + - YooKassaWalletApi (~> 2.6.0) + - YooMoneyCoreApi (~> 3.1) + - YooMoneySessionProfiler (~> 5.0.4) + - YooMoneyUI (~> 7.7) + - YooKassaPaymentsApi (2.22.0): - FunctionalSwift - - YooMoneyCoreApi (~> 3.0) - - YooKassaWalletApi (2.3.2): + - YooMoneyCoreApi (~> 3.1.1) + - YooKassaWalletApi (2.6.0): - FunctionalSwift - YooMoneyCoreApi - - YooMoneyCoreApi (3.0.7): + - YooMoneyCoreApi (3.1.1): - FunctionalSwift (~> 2.0) - - YooMoneySessionProfiler (5.0.1): - - MobileSdk (~> 2.0) - - YooMoneyUI (7.3.2): + - YooMoneySessionProfiler (5.0.4): + - FMobileSdk + - YooMoneyUI (7.7.5): - FunctionalSwift DEPENDENCIES: @@ -45,8 +105,8 @@ DEPENDENCIES: SPEC REPOS: https://git.yoomoney.ru/scm/sdk/cocoa-pod-specs.git: + - FMobileSdk - FunctionalSwift - - MobileSdk - MoneyAuth - YooKassaPayments - YooKassaPaymentsApi @@ -55,8 +115,24 @@ SPEC REPOS: - YooMoneySessionProfiler - YooMoneyUI https://github.com/CocoaPods/Specs.git: + - AppMetrica_FMDB + - AppMetrica_Protobuf + - AppMetricaAdSupport + - AppMetricaAnalytics + - AppMetricaCore + - AppMetricaCoreExtension + - AppMetricaCoreUtils + - AppMetricaCrashes + - AppMetricaEncodingUtils + - AppMetricaHostState + - AppMetricaLog + - AppMetricaNetwork + - AppMetricaPlatform + - AppMetricaProtobufUtils + - AppMetricaStorageUtils + - AppMetricaWebKit + - KSCrash - SPaySDK - - YandexMobileMetrica EXTERNAL SOURCES: Flutter: @@ -65,20 +141,36 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/yookassa_payments_flutter/ios" SPEC CHECKSUMS: + AppMetrica_FMDB: 86a7247cecf4b315735b119f8547779bffca535a + AppMetrica_Protobuf: 326de64e6b52ab2cddce121c780461ac9eedb6c4 + AppMetricaAdSupport: 1ebdf7d6f4555675aa776fb7fee5bd96ebef1dcf + AppMetricaAnalytics: bebf8c4f75c5015937b3e51f878b30693d293944 + AppMetricaCore: 647efed7efaa8fad9e38aa417d95aeccaf8b0926 + AppMetricaCoreExtension: 2b93264b869438d890df5bf6a69407fce5542e1c + AppMetricaCoreUtils: f6b3cfde963e1027e3044630e2fd7e1007422c1b + AppMetricaCrashes: f096e2cee83a46769685b850df846f5822c81b24 + AppMetricaEncodingUtils: 3b7d0aafefbc9a0ae84515a4b381d0a576f944f2 + AppMetricaHostState: 280370ecaf3096d4ff313bb7c13fb13252ae99e7 + AppMetricaLog: 7f5b21edad9e93e12d5d8e2aeafd17cbc2befb2b + AppMetricaNetwork: 070f7ce9fcad0e97d762d76ed7616236f9c73417 + AppMetricaPlatform: 36742fdd5e4290ab923cf5ede28612dae96a6671 + AppMetricaProtobufUtils: 37f172ca2fffacba2f0d564308c873bba4726b88 + AppMetricaStorageUtils: 4de179f2354946734cc7c407322398f5276e3305 + AppMetricaWebKit: 271bdf19ac5473df925213ec80d330805ed96818 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - FunctionalSwift: f812f61d24f78fdac9fb361f26c7f21acc337c91 - MobileSdk: 827ec8a9ef58a60f35e920cebaecf74f20a250c4 - MoneyAuth: 47daad5ba74241b1a8ebae3b0ea4eb6600867939 + FMobileSdk: 8c49b5c8207eb4b92df761bbf16486f03bdac6ac + FunctionalSwift: 89f68db7d8cf103a4dc0878fbaa007a2a5532485 + KSCrash: 593ec373759e4c1bce381421a627326a20d2dc66 + MoneyAuth: fb314f645566841d3fe11a877794dde5e7589b2a SPaySDK: 1015f868b6e9255457704cd6a3d051829263661a - YandexMobileMetrica: f5368ee93f286c793d73b58da00929babfc897c1 - yookassa_payments_flutter: 7c9be9ba6fdae53b98b2e715a3d80d42e2bdd8ff - YooKassaPayments: 854eed87863761c6e9c164ece203f125e1bffb64 - YooKassaPaymentsApi: b6172fa43e58e79ad730c3ccc2692471cee6ea9c - YooKassaWalletApi: cbb352525bfe89fd2ad52635062f79f8bbbc23ec - YooMoneyCoreApi: 0e5c123a9c981ea2384b86986d3ba64a096431f9 - YooMoneySessionProfiler: 1a19bed99feca98c04e2a906908f91a7d5db408d - YooMoneyUI: 94078f98dc65bee756c215a14fbf70ad3469f289 + yookassa_payments_flutter: f36a2380714a41ecd238667db3768052ab1c2240 + YooKassaPayments: 1f1e5daab12dd05b11e56fe568c71b5a43b77b14 + YooKassaPaymentsApi: 88ecca54eaf785787eeb1682f352016757ec0cdc + YooKassaWalletApi: 034a9d4f122557377ae3b9284e6292603fb38e6b + YooMoneyCoreApi: f53a22898878aab2f07449351a8a08f4918a6100 + YooMoneySessionProfiler: f4ac772cb6675f1200efbde75d69126eb4c867e6 + YooMoneyUI: f91e3e4bd1d8834bef169e7e8bd463c6a9e82944 -PODFILE CHECKSUM: 6abfb72a0d401d5c53824cfe614a85f37a1a3040 +PODFILE CHECKSUM: d83a67078f664dc9b52d32635e3e488dc83a611b COCOAPODS: 1.14.2 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 1581a6e..7c3be5a 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -407,7 +407,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -431,7 +431,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/example/pubspec.lock b/example/pubspec.lock index 9291d44..946277d 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -190,7 +190,7 @@ packages: path: ".." relative: true source: path - version: "1.2.2" + version: "1.3.1" sdks: dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.5" diff --git a/ios/yookassa_payments_flutter.podspec b/ios/yookassa_payments_flutter.podspec index f07f080..cb0524b 100644 --- a/ios/yookassa_payments_flutter.podspec +++ b/ios/yookassa_payments_flutter.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'yookassa_payments_flutter' - s.version = '0.0.1' + s.version = '1.3.1' s.summary = 'Flutter SDK from yoomoney' s.description = <<-DESC Flutter SDK from yoomoney @@ -11,9 +11,9 @@ Flutter SDK from yoomoney s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'YooKassaPayments', '6.14.0' + s.dependency 'YooKassaPayments', '6.16.0' - s.platform = :ios, '10.0' + s.platform = :ios, '14.0' # Flutter.framework does not contain a i386 slice. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } diff --git a/lib/yookassa_payments_flutter.dart b/lib/yookassa_payments_flutter.dart index 35a2738..1ee2d4d 100644 --- a/lib/yookassa_payments_flutter.dart +++ b/lib/yookassa_payments_flutter.dart @@ -30,7 +30,7 @@ class YookassaPaymentsFlutter { } static Future confirmation(String url, PaymentMethod? paymentMethod, - String? clientApplicationKey, String? shopId) async { + String clientApplicationKey, String shopId) async { var inputData = { 'url': url, 'paymentMethod': paymentMethod?.name, diff --git a/pubspec.lock b/pubspec.lock index ab91d85..3ad4719 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,51 +5,50 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.18.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -59,7 +58,8 @@ packages: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 + url: "https://pub.dev" source: hosted version: "1.0.4" flutter_test: @@ -71,37 +71,42 @@ packages: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + url: "https://pub.dev" source: hosted version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "0.5.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.10.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.8.3" sky_engine: dependency: transitive description: flutter @@ -111,58 +116,66 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + url: "https://pub.dev" source: hosted - version: "0.4.8" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.6.1" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" sdks: - dart: ">=2.15.0 <3.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=2.10.5" diff --git a/pubspec.yaml b/pubspec.yaml index 1895cc8..1ffde40 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: yookassa_payments_flutter description: This Flutter SDK allows processing payments using a payment token. It works as an addition to the YooMoney API. -version: 1.3.0 +version: 1.4.0 homepage: https://git.yoomoney.ru/projects/SDK/repos/yookassa-payments-flutter-sdk/browse repository: https://git.yoomoney.ru/projects/SDK/repos/yookassa-payments-flutter-sdk/browse environment: