diff --git a/ASDKCore.podspec b/ASDKCore.podspec index f68c060..3829ce0 100644 --- a/ASDKCore.podspec +++ b/ASDKCore.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = "ASDKCore" - s.version = "1.3.2" + s.version = "1.3.3" s.summary = "Core library that allows you to use internet acquiring from Tinkoff Bank in your app" s.description = "Core library that allows you to use internet acquiring from Tinkoff Bank in your app!" diff --git a/ASDKCore.xcodeproj/project.pbxproj b/ASDKCore.xcodeproj/project.pbxproj index c2e9bb0..0898082 100644 --- a/ASDKCore.xcodeproj/project.pbxproj +++ b/ASDKCore.xcodeproj/project.pbxproj @@ -49,8 +49,8 @@ 2C6E6BAA1F94CB0300B345B9 /* ASDKRequestSubmitRandomAmount.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C6E6BA81F94CB0300B345B9 /* ASDKRequestSubmitRandomAmount.m */; }; 2C6E6BAD1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C6E6BAB1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.h */; }; 2C6E6BAE1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C6E6BAC1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.m */; }; - 2CFBF58E1FCBFD180060C87F /* ASDKUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CFBF58C1FCBFD180060C87F /* ASDKUtils.h */; }; - 2CFBF58F1FCBFD180060C87F /* ASDKUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFBF58D1FCBFD180060C87F /* ASDKUtils.m */; }; + 2CFBF58E1FCBFD180060C87F /* ASDKUtilsAmount.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CFBF58C1FCBFD180060C87F /* ASDKUtilsAmount.h */; }; + 2CFBF58F1FCBFD180060C87F /* ASDKUtilsAmount.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFBF58D1FCBFD180060C87F /* ASDKUtilsAmount.m */; }; 83166ED71C63984E00533D85 /* ASDKCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 83166ED61C63984E00533D85 /* ASDKCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; 83166F2F1C63988F00533D85 /* ASDKBaseObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 83166EE11C63988F00533D85 /* ASDKBaseObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 83166F301C63988F00533D85 /* ASDKBaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 83166EE21C63988F00533D85 /* ASDKBaseObject.m */; }; @@ -152,8 +152,8 @@ 2C6E6BA81F94CB0300B345B9 /* ASDKRequestSubmitRandomAmount.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASDKRequestSubmitRandomAmount.m; sourceTree = ""; }; 2C6E6BAB1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASDKRequestBuilderSubmitRandomAmount.h; sourceTree = ""; }; 2C6E6BAC1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASDKRequestBuilderSubmitRandomAmount.m; sourceTree = ""; }; - 2CFBF58C1FCBFD180060C87F /* ASDKUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASDKUtils.h; sourceTree = ""; }; - 2CFBF58D1FCBFD180060C87F /* ASDKUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASDKUtils.m; sourceTree = ""; }; + 2CFBF58C1FCBFD180060C87F /* ASDKUtilsAmount.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASDKUtilsAmount.h; sourceTree = ""; }; + 2CFBF58D1FCBFD180060C87F /* ASDKUtilsAmount.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ASDKUtilsAmount.m; sourceTree = ""; }; 83166ED31C63984E00533D85 /* ASDKCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ASDKCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 83166ED61C63984E00533D85 /* ASDKCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ASDKCore.h; sourceTree = ""; }; 83166ED81C63984E00533D85 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -268,8 +268,8 @@ 946C39A21C64921A0036D1AF /* ASDKApiKeys.h */, 83166F151C63988F00533D85 /* CryptoUtils */, 83166F181C63988F00533D85 /* RequestBuilder */, - 2CFBF58C1FCBFD180060C87F /* ASDKUtils.h */, - 2CFBF58D1FCBFD180060C87F /* ASDKUtils.m */, + 2CFBF58C1FCBFD180060C87F /* ASDKUtilsAmount.h */, + 2CFBF58D1FCBFD180060C87F /* ASDKUtilsAmount.m */, ); path = ASDKCore; sourceTree = ""; @@ -614,7 +614,7 @@ 83166F411C63988F00533D85 /* ASDKAcquiringResponse.h in Headers */, 946C399E1C648F940036D1AF /* ASDKCardData.h in Headers */, 2C352DAB1E4B1707008215A5 /* ASDKCancelRequestBuilder.h in Headers */, - 2CFBF58E1FCBFD180060C87F /* ASDKUtils.h in Headers */, + 2CFBF58E1FCBFD180060C87F /* ASDKUtilsAmount.h in Headers */, 2C1C13451F8F6184002B636F /* ASDKRequestAttachCard.h in Headers */, 943FC86D1C6881650044C707 /* ASDKPaymentInfo.h in Headers */, 83166F4F1C63988F00533D85 /* ASDKAcquiringApi.h in Headers */, @@ -768,7 +768,7 @@ 83871B801C6CC5EF00D69603 /* ASDKStringKeyCreator.m in Sources */, 83166F501C63988F00533D85 /* ASDKAcquiringApi.m in Sources */, 83166F4A1C63988F00533D85 /* ASDKGetStateResponse.m in Sources */, - 2CFBF58F1FCBFD180060C87F /* ASDKUtils.m in Sources */, + 2CFBF58F1FCBFD180060C87F /* ASDKUtilsAmount.m in Sources */, 2C6E6BA01F949F9700B345B9 /* ASDKResponseGetAddCardState.m in Sources */, 2C1C134A1F8F8112002B636F /* ASDKResponseAddCardInit.m in Sources */, 83166F5D1C63988F00533D85 /* ASDKGetCardListRequestBuilder.m in Sources */, diff --git a/ASDKCore/API Objects/Request/ASDKRequestSubmitRandomAmount.m b/ASDKCore/API Objects/Request/ASDKRequestSubmitRandomAmount.m index 2a339e5..9b69a1b 100644 --- a/ASDKCore/API Objects/Request/ASDKRequestSubmitRandomAmount.m +++ b/ASDKCore/API Objects/Request/ASDKRequestSubmitRandomAmount.m @@ -19,7 +19,7 @@ // #import "ASDKRequestSubmitRandomAmount.h" -#import "ASDKUtils.h" +#import "ASDKUtilsAmount.h" @implementation ASDKRequestSubmitRandomAmount @@ -31,7 +31,7 @@ - (instancetype)initWithTerminalKey:(NSString *)terminalKey if (self = [super initWithTerminalKey:terminalKey token:token]) { _requestKey = requestKey; - _amount = [ASDKUtils amountWholeDigits:amount.doubleValue]; + _amount = [ASDKUtilsAmount amountWholeDigits:amount.doubleValue]; } return self; diff --git a/ASDKCore/ASDKUtils.h b/ASDKCore/ASDKUtilsAmount.h similarity index 93% rename from ASDKCore/ASDKUtils.h rename to ASDKCore/ASDKUtilsAmount.h index 53df4e5..8ca00b1 100644 --- a/ASDKCore/ASDKUtils.h +++ b/ASDKCore/ASDKUtilsAmount.h @@ -1,5 +1,5 @@ // -// ASDKUtils.h +// ASDKUtilsAmount.h // ASDKCore // // Created by v.budnikov on 27.11.2017. @@ -22,7 +22,7 @@ extern NSString *const kSumDecimalSeparator; -@interface ASDKUtils : NSObject +@interface ASDKUtilsAmount : NSObject + (NSString *)amountWholeDigits:(double)amount; diff --git a/ASDKCore/ASDKUtils.m b/ASDKCore/ASDKUtilsAmount.m similarity index 94% rename from ASDKCore/ASDKUtils.m rename to ASDKCore/ASDKUtilsAmount.m index ab5055b..daeb283 100644 --- a/ASDKCore/ASDKUtils.m +++ b/ASDKCore/ASDKUtilsAmount.m @@ -1,5 +1,5 @@ // -// ASDKUtils.m +// ASDKUtilsAmount.m // ASDKCore // // Copyright © 2017 Tinkoff Bank. All rights reserved. @@ -17,11 +17,11 @@ // limitations under the License. // -#import "ASDKUtils.h" +#import "ASDKUtilsAmount.h" NSString *const kSumDecimalSeparator = @","; -@implementation ASDKUtils +@implementation ASDKUtilsAmount + (NSNumberFormatter *)sumNumberFormatter { diff --git a/ASDKCore/RequestBuilder/Init/ASDKInitRequestBuilder.m b/ASDKCore/RequestBuilder/Init/ASDKInitRequestBuilder.m index e066610..5e96239 100644 --- a/ASDKCore/RequestBuilder/Init/ASDKInitRequestBuilder.m +++ b/ASDKCore/RequestBuilder/Init/ASDKInitRequestBuilder.m @@ -17,7 +17,7 @@ // limitations under the License. #import "ASDKInitRequestBuilder.h" -#import "ASDKUtils.h" +#import "ASDKUtilsAmount.h" @interface ASDKInitRequestBuilder () @@ -51,7 +51,7 @@ + (ASDKInitRequestBuilder *)builderWithAmount:(NSNumber *)amount if (builder) { - builder.amount = [ASDKUtils amountWholeDigits:amount.doubleValue]; + builder.amount = [ASDKUtilsAmount amountWholeDigits:amount.doubleValue]; builder.orderId = orderId; builder.requestDescription = description; builder.payType = payType; diff --git a/ASDKUI.podspec b/ASDKUI.podspec index 074a361..e4bdde5 100644 --- a/ASDKUI.podspec +++ b/ASDKUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "ASDKUI" - s.version = "1.3.2" + s.version = "1.3.3" s.summary = "UI components library for internet acquiring from Tinkoff Bank" s.description = "UI components library for internet acquiring from Tinkoff Bank!" s.homepage = "https://www.tinkoff.ru" diff --git a/SampleProject/ASDKSampleApp/Supporting files/Info.plist b/SampleProject/ASDKSampleApp/Supporting files/Info.plist index 814ce01..20414c2 100644 --- a/SampleProject/ASDKSampleApp/Supporting files/Info.plist +++ b/SampleProject/ASDKSampleApp/Supporting files/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.2 + 1.3.3 CFBundleSignature ???? CFBundleVersion