Skip to content

Commit ce9c919

Browse files
author
v.budnikov
committed
additional request parameters for ApplePay
1 parent a05f33c commit ce9c919

File tree

7 files changed

+37
-60
lines changed

7 files changed

+37
-60
lines changed

‎ASDKCore.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Pod::Spec.new do |s|
1010

1111
s.name = "ASDKCore"
12-
s.version = "1.5.1"
12+
s.version = "1.5.2"
1313
s.summary = "Core library that allows you to use internet acquiring from Tinkoff Bank in your app"
1414
s.description = "Core library that allows you to use internet acquiring from Tinkoff Bank in your app!"
1515

‎ASDKCore.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@
932932
isa = XCBuildConfiguration;
933933
buildSettings = {
934934
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
935-
CURRENT_PROJECT_VERSION = 79;
935+
CURRENT_PROJECT_VERSION = 80;
936936
DEFINES_MODULE = YES;
937937
DYLIB_COMPATIBILITY_VERSION = 1;
938938
DYLIB_CURRENT_VERSION = 1;
@@ -941,7 +941,7 @@
941941
INFOPLIST_FILE = ASDKCore/Info.plist;
942942
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
943943
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
944-
MARKETING_VERSION = 1.5.1;
944+
MARKETING_VERSION = 1.5.2;
945945
ONLY_ACTIVE_ARCH = YES;
946946
OTHER_LDFLAGS = "";
947947
PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKCore;
@@ -954,7 +954,7 @@
954954
isa = XCBuildConfiguration;
955955
buildSettings = {
956956
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
957-
CURRENT_PROJECT_VERSION = 79;
957+
CURRENT_PROJECT_VERSION = 80;
958958
DEFINES_MODULE = YES;
959959
DYLIB_COMPATIBILITY_VERSION = 1;
960960
DYLIB_CURRENT_VERSION = 1;
@@ -963,7 +963,7 @@
963963
INFOPLIST_FILE = ASDKCore/Info.plist;
964964
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
965965
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
966-
MARKETING_VERSION = 1.5.1;
966+
MARKETING_VERSION = 1.5.2;
967967
ONLY_ACTIVE_ARCH = YES;
968968
OTHER_LDFLAGS = "";
969969
PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKCore;

‎ASDKCore/RequestBuilder/FinishAuthorize/ASDKFinishAuthorizeRequestBuilder.m

+2
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ - (NSDictionary *)parametersForToken
146146
if (self.encryptedPaymentData.length > 0)
147147
{
148148
[parameters setObject:self.encryptedPaymentData forKey:@"EncryptedPaymentData"];
149+
[parameters setObject:@"ACQ" forKey:@"Route"];
150+
[parameters setObject:@"ApplePay" forKey:@"Source"];
149151
}
150152
if (self.ipAddress.length > 0)
151153
{

‎ASDKUI.podspec

+1-26
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ASDKUI"
3-
s.version = "1.5.1"
3+
s.version = "1.5.2"
44
s.summary = "UI components library for internet acquiring from Tinkoff Bank"
55
s.description = "UI components library for internet acquiring from Tinkoff Bank!"
66
s.homepage = "https://www.tinkoff.ru"
@@ -12,31 +12,6 @@ Pod::Spec.new do |s|
1212

1313
s.source_files = "ASDKUI", "ASDKUI/**/*.{h,m}"
1414
s.resources = "ASDKUI/Resources/**/*.*" , "ASDKUI/**/*.{xib}"
15-
16-
17-
18-
# ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
19-
#
20-
# Link your library with frameworks, or libraries. Libraries do not include
21-
# the lib prefix of their name.
22-
#
23-
24-
# s.framework = "SomeFramework"
25-
# s.frameworks = "SomeFramework", "AnotherFramework"
26-
27-
# s.library = "iconv"
28-
# s.libraries = "iconv", "xml2"
29-
30-
31-
# ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
32-
#
33-
# If your library depends on compiler flags you can set them in the xcconfig hash
34-
# where they will only apply to your library. If you depend on other Podspecs
35-
# you can include multiple dependencies to ensure it works.
36-
37-
# s.requires_arc = true
38-
39-
# s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" }
4015
s.dependency "ASDKCore"
4116

4217
end

‎ASDKUI.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@
934934
buildSettings = {
935935
CLANG_ENABLE_MODULES = YES;
936936
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
937-
CURRENT_PROJECT_VERSION = 79;
937+
CURRENT_PROJECT_VERSION = 80;
938938
DEFINES_MODULE = YES;
939939
DYLIB_COMPATIBILITY_VERSION = 1;
940940
DYLIB_CURRENT_VERSION = 1;
@@ -948,7 +948,7 @@
948948
INFOPLIST_FILE = ASDKUI/Info.plist;
949949
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
950950
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
951-
MARKETING_VERSION = 1.5.1;
951+
MARKETING_VERSION = 1.5.2;
952952
ONLY_ACTIVE_ARCH = YES;
953953
PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKUI;
954954
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -963,7 +963,7 @@
963963
buildSettings = {
964964
CLANG_ENABLE_MODULES = YES;
965965
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
966-
CURRENT_PROJECT_VERSION = 79;
966+
CURRENT_PROJECT_VERSION = 80;
967967
DEFINES_MODULE = YES;
968968
DYLIB_COMPATIBILITY_VERSION = 1;
969969
DYLIB_CURRENT_VERSION = 1;
@@ -977,7 +977,7 @@
977977
INFOPLIST_FILE = ASDKUI/Info.plist;
978978
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
979979
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
980-
MARKETING_VERSION = 1.5.1;
980+
MARKETING_VERSION = 1.5.2;
981981
ONLY_ACTIVE_ARCH = YES;
982982
PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKUI;
983983
PRODUCT_NAME = "$(TARGET_NAME)";

‎SampleProject/ASDKSampleApp.xcodeproj/project.pbxproj

+24-24
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
2CEF63911F54377C00C368AE /* TransactionHistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CEF638A1F54377C00C368AE /* TransactionHistoryViewController.m */; };
1616
2CEF63921F54377C00C368AE /* TransactionHistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2CEF638B1F54377C00C368AE /* TransactionHistoryViewController.xib */; };
1717
2CEF63931F54377C00C368AE /* UITableViewHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CEF638D1F54377C00C368AE /* UITableViewHelpers.m */; };
18-
684AD5C6421F7F3343AABD7F /* libPods-ASDKSampleApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 38BBB53F96316A70A6C84981 /* libPods-ASDKSampleApp.a */; };
1918
83871B8B1C6DCFDC00D69603 /* ShopCart.m in Sources */ = {isa = PBXBuildFile; fileRef = 83871B8A1C6DCFDC00D69603 /* ShopCart.m */; };
2019
83871B8D1C6DF29C00D69603 /* DetailInfoTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83871B8C1C6DF29C00D69603 /* DetailInfoTableViewController.xib */; };
2120
83871B911C6E0C3100D69603 /* ShopCartTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 83871B901C6E0C3100D69603 /* ShopCartTableViewController.xib */; };
@@ -46,6 +45,7 @@
4645
C38C870B1D37B7F6001ABBFA /* ASDKCardIOScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = C38C870A1D37B7F6001ABBFA /* ASDKCardIOScanner.m */; };
4746
C3AAB1401DAFE3FC00C64972 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BEDEFF561C74B2A00026D454 /* Localizable.strings */; };
4847
C3AAB1411DAFE40000C64972 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C3F489211DACC5F20032EC5E /* InfoPlist.strings */; };
48+
CC18C5B6AA1BA09D370DDFF8 /* Pods_ASDKSampleApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FFB633105C8387E3014513EB /* Pods_ASDKSampleApp.framework */; };
4949
/* End PBXBuildFile section */
5050

5151
/* Begin PBXCopyFilesBuildPhase section */
@@ -75,7 +75,6 @@
7575
2CEF638B1F54377C00C368AE /* TransactionHistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TransactionHistoryViewController.xib; sourceTree = "<group>"; };
7676
2CEF638C1F54377C00C368AE /* UITableViewHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITableViewHelpers.h; sourceTree = "<group>"; };
7777
2CEF638D1F54377C00C368AE /* UITableViewHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITableViewHelpers.m; sourceTree = "<group>"; };
78-
38BBB53F96316A70A6C84981 /* libPods-ASDKSampleApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ASDKSampleApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7978
80ADADDCD6F59A2D7EF6C6A3 /* Pods-ASDKSampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ASDKSampleApp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ASDKSampleApp/Pods-ASDKSampleApp.debug.xcconfig"; sourceTree = "<group>"; };
8079
831672871C6486A500533D85 /* ASDKSampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ASDKSampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
8180
83871B891C6DCFDC00D69603 /* ShopCart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopCart.h; sourceTree = "<group>"; };
@@ -132,14 +131,15 @@
132131
C3F489201DACC5F20032EC5E /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
133132
C3F489231DACC6ED0032EC5E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
134133
C3F489241DACC6ED0032EC5E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
134+
FFB633105C8387E3014513EB /* Pods_ASDKSampleApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ASDKSampleApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
135135
/* End PBXFileReference section */
136136

137137
/* Begin PBXFrameworksBuildPhase section */
138138
831672841C6486A500533D85 /* Frameworks */ = {
139139
isa = PBXFrameworksBuildPhase;
140140
buildActionMask = 2147483647;
141141
files = (
142-
684AD5C6421F7F3343AABD7F /* libPods-ASDKSampleApp.a in Frameworks */,
142+
CC18C5B6AA1BA09D370DDFF8 /* Pods_ASDKSampleApp.framework in Frameworks */,
143143
);
144144
runOnlyForDeploymentPostprocessing = 0;
145145
};
@@ -166,7 +166,7 @@
166166
625962B01098A0E65DBF2FBD /* Frameworks */ = {
167167
isa = PBXGroup;
168168
children = (
169-
38BBB53F96316A70A6C84981 /* libPods-ASDKSampleApp.a */,
169+
FFB633105C8387E3014513EB /* Pods_ASDKSampleApp.framework */,
170170
);
171171
name = Frameworks;
172172
sourceTree = "<group>";
@@ -391,7 +391,7 @@
391391
831672841C6486A500533D85 /* Frameworks */,
392392
831672851C6486A500533D85 /* Resources */,
393393
831672A51C64878A00533D85 /* Embed Frameworks */,
394-
57600297A2546A01FB72C740 /* [CP] Copy Pods Resources */,
394+
B1428CA657CA7CAB30DFD47F /* [CP] Embed Pods Frameworks */,
395395
);
396396
buildRules = (
397397
);
@@ -473,39 +473,39 @@
473473
/* End PBXResourcesBuildPhase section */
474474

475475
/* Begin PBXShellScriptBuildPhase section */
476-
57600297A2546A01FB72C740 /* [CP] Copy Pods Resources */ = {
476+
6350D7BD1EF85E2BB386E837 /* [CP] Check Pods Manifest.lock */ = {
477477
isa = PBXShellScriptBuildPhase;
478478
buildActionMask = 2147483647;
479479
files = (
480480
);
481-
inputFileListPaths = (
482-
"${PODS_ROOT}/Target Support Files/Pods-ASDKSampleApp/Pods-ASDKSampleApp-resources-${CONFIGURATION}-input-files.xcfilelist",
481+
inputPaths = (
482+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
483+
"${PODS_ROOT}/Manifest.lock",
483484
);
484-
name = "[CP] Copy Pods Resources";
485-
outputFileListPaths = (
486-
"${PODS_ROOT}/Target Support Files/Pods-ASDKSampleApp/Pods-ASDKSampleApp-resources-${CONFIGURATION}-output-files.xcfilelist",
485+
name = "[CP] Check Pods Manifest.lock";
486+
outputPaths = (
487+
"$(DERIVED_FILE_DIR)/Pods-ASDKSampleApp-checkManifestLockResult.txt",
487488
);
488489
runOnlyForDeploymentPostprocessing = 0;
489490
shellPath = /bin/sh;
490-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ASDKSampleApp/Pods-ASDKSampleApp-resources.sh\"\n";
491+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
491492
showEnvVarsInLog = 0;
492493
};
493-
6350D7BD1EF85E2BB386E837 /* [CP] Check Pods Manifest.lock */ = {
494+
B1428CA657CA7CAB30DFD47F /* [CP] Embed Pods Frameworks */ = {
494495
isa = PBXShellScriptBuildPhase;
495496
buildActionMask = 2147483647;
496497
files = (
497498
);
498-
inputPaths = (
499-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
500-
"${PODS_ROOT}/Manifest.lock",
499+
inputFileListPaths = (
500+
"${PODS_ROOT}/Target Support Files/Pods-ASDKSampleApp/Pods-ASDKSampleApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
501501
);
502-
name = "[CP] Check Pods Manifest.lock";
503-
outputPaths = (
504-
"$(DERIVED_FILE_DIR)/Pods-ASDKSampleApp-checkManifestLockResult.txt",
502+
name = "[CP] Embed Pods Frameworks";
503+
outputFileListPaths = (
504+
"${PODS_ROOT}/Target Support Files/Pods-ASDKSampleApp/Pods-ASDKSampleApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
505505
);
506506
runOnlyForDeploymentPostprocessing = 0;
507507
shellPath = /bin/sh;
508-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
508+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ASDKSampleApp/Pods-ASDKSampleApp-frameworks.sh\"\n";
509509
showEnvVarsInLog = 0;
510510
};
511511
/* End PBXShellScriptBuildPhase section */
@@ -677,7 +677,7 @@
677677
buildSettings = {
678678
CODE_SIGN_ENTITLEMENTS = ASDKSampleApp/ASDKSampleApp.entitlements;
679679
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
680-
CURRENT_PROJECT_VERSION = 79;
680+
CURRENT_PROJECT_VERSION = 80;
681681
DEVELOPMENT_TEAM = 8SEFGGQX9M;
682682
ENABLE_BITCODE = YES;
683683
FRAMEWORK_SEARCH_PATHS = (
@@ -690,7 +690,7 @@
690690
"$(inherited)",
691691
"@executable_path/Frameworks",
692692
);
693-
MARKETING_VERSION = 1.5.1;
693+
MARKETING_VERSION = 1.5.2;
694694
PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKSample;
695695
PRODUCT_NAME = "$(TARGET_NAME)";
696696
PROVISIONING_PROFILE = "179273f2-bc09-426b-b1e5-b41e5ca91de9";
@@ -705,7 +705,7 @@
705705
buildSettings = {
706706
CODE_SIGN_ENTITLEMENTS = ASDKSampleApp/ASDKSampleApp.entitlements;
707707
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
708-
CURRENT_PROJECT_VERSION = 79;
708+
CURRENT_PROJECT_VERSION = 80;
709709
DEVELOPMENT_TEAM = 8SEFGGQX9M;
710710
ENABLE_BITCODE = YES;
711711
FRAMEWORK_SEARCH_PATHS = (
@@ -718,7 +718,7 @@
718718
"$(inherited)",
719719
"@executable_path/Frameworks",
720720
);
721-
MARKETING_VERSION = 1.5.1;
721+
MARKETING_VERSION = 1.5.2;
722722
PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKSample;
723723
PRODUCT_NAME = "$(TARGET_NAME)";
724724
PROVISIONING_PROFILE = "179273f2-bc09-426b-b1e5-b41e5ca91de9";

‎SampleProject/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Uncomment this line to define a global platform for your project
22
# Uncomment this line if you're using Swift
3-
# use_frameworks!
3+
use_frameworks!
44

55
platform :ios, '9.0'
66

0 commit comments

Comments
 (0)