diff --git a/Examples/ObjectiveCExampleApp/Podfile.lock b/Examples/ObjectiveCExampleApp/Podfile.lock index 4b6699287..48717048b 100644 --- a/Examples/ObjectiveCExampleApp/Podfile.lock +++ b/Examples/ObjectiveCExampleApp/Podfile.lock @@ -5,7 +5,7 @@ PODS: - OpenSSL-Universal (~> 1.1.180) - InAppSettingsKit (3.3.6) - Judo3DS2_iOS (1.0.1) - - JudoKit-iOS (3.0.1): + - JudoKit-iOS (3.0.2): - DeviceDNA (~> 2.0.0) - Judo3DS2_iOS (~> 1.0.1) - TrustKit @@ -121,7 +121,7 @@ SPEC CHECKSUMS: DeviceDNA: 9ff289d1fb983937754b324fa0adade2081210c4 InAppSettingsKit: 37df0b44132380d4c7db6fc7cded92997e29873a Judo3DS2_iOS: c1ccf49ecacddb4559a73fb7eae6e680e2355b21 - JudoKit-iOS: ff5d3b707ad4882137f96873dc269ab0bff6e030 + JudoKit-iOS: 4a96c63d4cfb45bb1a68a1891b2ebaeaa8a46be1 MaterialComponents: 1a9b2d9d45b1601ae544de85089adc4c464306d4 MDFInternationalization: d697c55307816222a55685c4ccb1044ffb030c12 MDFTextAccessibility: f4bb4cc2194286651b59a215fdeaa0e05dc90ba5 diff --git a/JudoKit-iOS.podspec b/JudoKit-iOS.podspec index 58c60cba0..429ca1aa3 100755 --- a/JudoKit-iOS.podspec +++ b/JudoKit-iOS.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'JudoKit-iOS' - s.version = '3.0.1' + s.version = '3.0.2' s.summary = 'Judo Pay Full iOS Client Kit' s.homepage = 'https://www.judopay.com/' s.license = 'MIT' diff --git a/JudoKit_iOS.xcodeproj/project.pbxproj b/JudoKit_iOS.xcodeproj/project.pbxproj index 540511154..534ee745a 100644 --- a/JudoKit_iOS.xcodeproj/project.pbxproj +++ b/JudoKit_iOS.xcodeproj/project.pbxproj @@ -323,6 +323,8 @@ 4492117A246A044D00DF6D14 /* JPTransactionViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 44921179246A044D00DF6D14 /* JPTransactionViewDelegate.h */; }; 4492117C246A04C500DF6D14 /* JPPaymentMethodsCardListHeaderCellDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4492117B246A04C500DF6D14 /* JPPaymentMethodsCardListHeaderCellDelegate.h */; }; 4492117E246A052300DF6D14 /* JPSectionViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4492117D246A052300DF6D14 /* JPSectionViewDelegate.h */; }; + 44A60A24288AB0F800B360E1 /* JPNetworkTimeout.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A60A22288AB0F800B360E1 /* JPNetworkTimeout.m */; }; + 44A60A25288AB0F800B360E1 /* JPNetworkTimeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A60A23288AB0F800B360E1 /* JPNetworkTimeout.h */; settings = {ATTRIBUTES = (Public, ); }; }; 525FF3D8252C41CF001F030E /* JPCardScanControllerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 525FF3D0252C41CF001F030E /* JPCardScanControllerDelegate.h */; }; 525FF3D9252C41CF001F030E /* JPCardScanController.h in Headers */ = {isa = PBXBuildFile; fileRef = 525FF3D1252C41CF001F030E /* JPCardScanController.h */; }; 525FF3DA252C41CF001F030E /* JPCardScanController.m in Sources */ = {isa = PBXBuildFile; fileRef = 525FF3D2252C41CF001F030E /* JPCardScanController.m */; }; @@ -753,6 +755,8 @@ 44921179246A044D00DF6D14 /* JPTransactionViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JPTransactionViewDelegate.h; sourceTree = ""; }; 4492117B246A04C500DF6D14 /* JPPaymentMethodsCardListHeaderCellDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JPPaymentMethodsCardListHeaderCellDelegate.h; sourceTree = ""; }; 4492117D246A052300DF6D14 /* JPSectionViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JPSectionViewDelegate.h; sourceTree = ""; }; + 44A60A22288AB0F800B360E1 /* JPNetworkTimeout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPNetworkTimeout.m; sourceTree = ""; }; + 44A60A23288AB0F800B360E1 /* JPNetworkTimeout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPNetworkTimeout.h; sourceTree = ""; }; 525FF3D0252C41CF001F030E /* JPCardScanControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPCardScanControllerDelegate.h; sourceTree = ""; }; 525FF3D1252C41CF001F030E /* JPCardScanController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPCardScanController.h; sourceTree = ""; }; 525FF3D2252C41CF001F030E /* JPCardScanController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPCardScanController.m; sourceTree = ""; }; @@ -1636,6 +1640,7 @@ 300071C523F6A78E0099F3C5 /* Models */ = { isa = PBXGroup; children = ( + 44A60A21288AB0F800B360E1 /* NetworkTimeout */, 3000737923FBECCE0099F3C5 /* 3DSConfiguration */, 3000728F23F6AB550099F3C5 /* Address */, 3000726223F6AB540099F3C5 /* Amount */, @@ -2674,6 +2679,15 @@ path = JPFormatters; sourceTree = ""; }; + 44A60A21288AB0F800B360E1 /* NetworkTimeout */ = { + isa = PBXGroup; + children = ( + 44A60A22288AB0F800B360E1 /* JPNetworkTimeout.m */, + 44A60A23288AB0F800B360E1 /* JPNetworkTimeout.h */, + ); + path = NetworkTimeout; + sourceTree = ""; + }; 525FF3CF252C41CF001F030E /* CardScanController */ = { isa = PBXGroup; children = ( @@ -3061,6 +3075,7 @@ 30221C1123FE617300BF2823 /* NSLayoutConstraint+Additions.h in Headers */, 30D61D6823BB741A004E5CEE /* JPPaymentMethodsView.h in Headers */, 3058351E2406583400B61167 /* JPCardCustomizationSubmitCell.h in Headers */, + 44A60A25288AB0F800B360E1 /* JPNetworkTimeout.h in Headers */, 30006F6223F698A20099F3C5 /* JPInputField.h in Headers */, 300072E123F6AB560099F3C5 /* JPAddress.h in Headers */, 30006F9D23F6993A0099F3C5 /* UIStackView+Additions.h in Headers */, @@ -3306,6 +3321,7 @@ 300072DF23F6AB560099F3C5 /* JPCountry.m in Sources */, 4431198C24B3345200BF961C /* JPRequest+Additions.m in Sources */, 30006F9B23F6993A0099F3C5 /* UIApplication+Additions.m in Sources */, + 44A60A24288AB0F800B360E1 /* JPNetworkTimeout.m in Sources */, 30221C3523FE6D9200BF2823 /* JPCardCustomizationInteractor.m in Sources */, 52B4CA44241EF7AA009C28DC /* JPIDEALViewController.m in Sources */, 300072F823F6AB560099F3C5 /* JPReference.m in Sources */, diff --git a/Source/JudoKit.h b/Source/JudoKit.h index 99f99cbad..6daa5ae83 100644 --- a/Source/JudoKit.h +++ b/Source/JudoKit.h @@ -32,7 +32,7 @@ @protocol JPAuthorization; static NSString *__nonnull const JudoKitName = @"JudoKit_iOS"; -static NSString *__nonnull const JudoKitVersion = @"3.0.1"; +static NSString *__nonnull const JudoKitVersion = @"3.0.2"; @interface JudoKit : NSObject diff --git a/Source/JudoKit_iOS.h b/Source/JudoKit_iOS.h index ca4c8cdc6..fd9e204a9 100644 --- a/Source/JudoKit_iOS.h +++ b/Source/JudoKit_iOS.h @@ -78,6 +78,7 @@ #import "JPComplete3DS2Request.h" #import "JPPaymentRequest.h" #import "JPRequest.h" +#import "JPNetworkTimeout.h" #import "JP3DSecureAuthenticationResult.h" #import "JPApplePayRequest.h" diff --git a/Source/Models/Configuration/JPConfiguration.h b/Source/Models/Configuration/JPConfiguration.h index 8f131dccf..0c75bceb4 100644 --- a/Source/Models/Configuration/JPConfiguration.h +++ b/Source/Models/Configuration/JPConfiguration.h @@ -32,38 +32,38 @@ /** * The Judo ID required for most JudoKit transactions */ -@property (nonatomic, strong, readonly) NSString *_Nullable judoId; +@property (nonatomic, strong, readonly, nullable) NSString *judoId; /** * The Receipt ID required for Refund, Void and Collection transactions */ -@property (nonatomic, strong, readonly) NSString *_Nullable receiptId; +@property (nonatomic, strong, readonly, nullable) NSString *receiptId; /** * An object describing the amount of the transaction */ -@property (nonatomic, strong) JPAmount *_Nonnull amount; +@property (nonatomic, strong, nonnull) JPAmount *amount; /** * An object containing transaction-related references */ -@property (nonatomic, strong) JPReference *_Nonnull reference; +@property (nonatomic, strong, nonnull) JPReference *reference; /** * An object containing information about the card address. * If set, will be sent to the Judo backend as part of the card details */ -@property (nonatomic, strong) JPAddress *_Nullable cardAddress; +@property (nonatomic, strong, nullable) JPAddress *cardAddress; /** * An object responsible for handling UI-related configurations */ -@property (nonatomic, strong) JPUIConfiguration *_Nonnull uiConfiguration; +@property (nonatomic, strong, nonnull) JPUIConfiguration *uiConfiguration; /** * An array of JPPaymentMethod instances used to specify the payment methods that are to be displayed on the Judo Payment Method screen. */ -@property (nonatomic, strong) NSArray *_Nullable paymentMethods; +@property (nonatomic, strong, nullable) NSArray *paymentMethods; /** * An NS_OPTION property used to pick between a set of supported card network values. @@ -73,18 +73,18 @@ /** * An instance of JPPrimaryAccountDetails that, if set, will be passed in the transaction's request body. */ -@property (nonatomic, strong) JPPrimaryAccountDetails *_Nullable primaryAccountDetails; +@property (nonatomic, strong, nullable) JPPrimaryAccountDetails *primaryAccountDetails; /** * An instance of JPApplePayConfiguration required for Apple Pay-related transactions. * Not setting this property will hide Apple Pay from the Judo Payment Method screen, even though it has been set as one of the payment methods. */ -@property (nonatomic, strong) JPApplePayConfiguration *_Nullable applePayConfiguration; +@property (nonatomic, strong, nullable) JPApplePayConfiguration *applePayConfiguration; /** * An instance of JPPbbaConfiguration required for PbBA Pay-related transactions. */ -@property (nonatomic, strong) JPPBBAConfiguration *_Nullable pbbaConfiguration; +@property (nonatomic, strong, nullable) JPPBBAConfiguration *pbbaConfiguration; /** * A flag to sign up for a subscription-based service @@ -94,28 +94,28 @@ /** * Sets the network read, write and connect timeouts. */ -@property (nonatomic, nullable, strong) JPNetworkTimeout *networkTimeout; +@property (nonatomic, strong, nullable) JPNetworkTimeout *networkTimeout; /** * 3DS Challenge Request Indicator */ -@property (nonatomic, nullable, copy) NSString *challengeRequestIndicator; +@property (nonatomic, strong, nonnull) NSString *challengeRequestIndicator; /** * 3DS SCA Exemption */ -@property (nonatomic, nullable, copy) NSString *scaExemption; +@property (nonatomic, strong, nonnull) NSString *scaExemption; /** * The card holder email */ -@property (nonatomic, assign) NSString *_Nullable emailAddress; +@property (nonatomic, strong, nullable) NSString *emailAddress; /** * The card holder mobile number */ -@property (nonatomic, assign) NSString *_Nullable phoneCountryCode; -@property (nonatomic, assign) NSString *_Nullable mobileNumber; +@property (nonatomic, strong, nullable) NSString *phoneCountryCode; +@property (nonatomic, strong, nullable) NSString *mobileNumber; /** * Sets the maximum timeout for 3DS 2.0 transactions in minutes. @@ -125,7 +125,7 @@ /** * Sets the protocol message version for 3DS 2.0 transactions. */ -@property (nonatomic, assign) NSString *_Nullable threeDSTwoMessageVersion; +@property (nonatomic, strong, nullable) NSString *threeDSTwoMessageVersion; /** * Designated initializer that sets the required parameters for most Judo transations. diff --git a/Source/include/JPNetworkTimeout.h b/Source/include/JPNetworkTimeout.h new file mode 120000 index 000000000..168b48953 --- /dev/null +++ b/Source/include/JPNetworkTimeout.h @@ -0,0 +1 @@ +../Models/NetworkTimeout/JPNetworkTimeout.h \ No newline at end of file diff --git a/Source/include/create_symlinks.sh b/Source/include/create_symlinks.sh index 0300869d6..240083521 100755 --- a/Source/include/create_symlinks.sh +++ b/Source/include/create_symlinks.sh @@ -161,3 +161,4 @@ ln -s -f ../Modules/Transaction/Builder/JPTransactionBuilder.h JPTransactionBuil ln -s -f ../Models/Request/JPComplete3DS2Request.h JPComplete3DS2Request.h ln -s -f ../Extensions/JPResponse/JPResponse+Additions.h JPResponse+Additions.h ln -s -f ../Models/CReqParameters/JPCReqParameters.h JPCReqParameters.h +ln -s -f ../Models/NetworkTimeout/JPNetworkTimeout.h JPNetworkTimeout.h