diff --git a/.circleci/config.yml b/.circleci/config.yml index ffdaaa08c..2ea43e51a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 executors: macos: macos: - xcode: 15.2.0 + xcode: 15.3.0 orbs: slack: circleci/slack@4.12.5 diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..15a279981 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.3.0 diff --git a/Cartfile b/Cartfile index 4f618e08b..816c21d13 100644 --- a/Cartfile +++ b/Cartfile @@ -1,5 +1,4 @@ -github "datatheorem/TrustKit" == 3.0.3 -binary "https://raw.githubusercontent.com/Judopay/DeviceDNA-iOS/master/DeviceDNA.json" == 2.1.0 -binary "https://raw.githubusercontent.com/Judopay/Judo3DS2-iOS/master/Judo3DS2_iOS.json" == 1.2.0 -github "krzyzanowskim/OpenSSL" ~> 1.1.2200 -binary "https://raw.githubusercontent.com/unravelin/ravelin-encrypt-ios-xcframework-distribution/main/RavelinEncrypt.json" == 1.1.1 +github "datatheorem/TrustKit" >= 3.0.4 +binary "https://raw.githubusercontent.com/Judopay/DeviceDNA-iOS/master/DeviceDNA.json" == 2.1.1 +binary "https://raw.githubusercontent.com/Judopay/Judo3DS2-iOS/master/Judo3DS2_iOS.json" == 1.2.1 +binary "https://raw.githubusercontent.com/unravelin/ravelin-encrypt-ios-xcframework-distribution/main/RavelinEncrypt.json" == 1.1.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5bbd52af6..dc42eef3c 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,5 @@ -binary "https://raw.githubusercontent.com/Judopay/DeviceDNA-iOS/master/DeviceDNA.json" "2.1.0" -binary "https://raw.githubusercontent.com/Judopay/Judo3DS2-iOS/master/Judo3DS2_iOS.json" "1.2.0" -binary "https://raw.githubusercontent.com/unravelin/ravelin-encrypt-ios-xcframework-distribution/main/RavelinEncrypt.json" "1.1.1" +binary "https://raw.githubusercontent.com/Judopay/DeviceDNA-iOS/master/DeviceDNA.json" "2.1.1" +binary "https://raw.githubusercontent.com/Judopay/Judo3DS2-iOS/master/Judo3DS2_iOS.json" "1.2.1" +binary "https://raw.githubusercontent.com/unravelin/ravelin-encrypt-ios-xcframework-distribution/main/RavelinEncrypt.json" "1.1.2" github "Judopay/OHHTTPStubs" "44d4eeb9063200d507d67a081539c19f4af227c3" -github "datatheorem/TrustKit" "3.0.3" -github "krzyzanowskim/OpenSSL" "1.1.2200" +github "datatheorem/TrustKit" "3.0.4" diff --git a/Examples/CarthageExampleApp/CarthageExampleApp.xcodeproj/project.pbxproj b/Examples/CarthageExampleApp/CarthageExampleApp.xcodeproj/project.pbxproj index 746b0155d..6da7b3142 100644 --- a/Examples/CarthageExampleApp/CarthageExampleApp.xcodeproj/project.pbxproj +++ b/Examples/CarthageExampleApp/CarthageExampleApp.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ + 44469A722BFDF80200F922B8 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 44469A712BFDF80200F922B8 /* PrivacyInfo.xcprivacy */; }; 448AB1A32450DE8F004A11CB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 448AB1A22450DE8F004A11CB /* AppDelegate.m */; }; 448AB1AC2450DE8F004A11CB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 448AB1AA2450DE8F004A11CB /* Main.storyboard */; }; 448AB1AE2450DE93004A11CB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 448AB1AD2450DE93004A11CB /* Assets.xcassets */; }; @@ -20,8 +21,6 @@ ADFF51DD2847A84F00DA884C /* TrustKit.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADFF51DB2847A84F00DA884C /* TrustKit.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; ADFF51DF2847A85F00DA884C /* JudoKit_iOS.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADFF51DE2847A85F00DA884C /* JudoKit_iOS.xcframework */; }; ADFF51E02847A85F00DA884C /* JudoKit_iOS.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADFF51DE2847A85F00DA884C /* JudoKit_iOS.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - ADFF51E22847A9A400DA884C /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADFF51E12847A9A400DA884C /* OpenSSL.xcframework */; }; - ADFF51E32847A9A400DA884C /* OpenSSL.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = ADFF51E12847A9A400DA884C /* OpenSSL.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -50,7 +49,6 @@ files = ( ADFF51DA2847A83D00DA884C /* DeviceDNA.xcframework in Embed Frameworks */, ADFF51DD2847A84F00DA884C /* TrustKit.xcframework in Embed Frameworks */, - ADFF51E32847A9A400DA884C /* OpenSSL.xcframework in Embed Frameworks */, ADFF51E02847A85F00DA884C /* JudoKit_iOS.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -59,6 +57,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 44469A712BFDF80200F922B8 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 448AB19E2450DE8F004A11CB /* Judopay demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Judopay demo.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 448AB1A12450DE8F004A11CB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 448AB1A22450DE8F004A11CB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; @@ -71,15 +70,14 @@ 448AB1BF2450DE93004A11CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 448AB1C42450DE93004A11CB /* CarthageExampleAppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CarthageExampleAppUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 448AB1CA2450DE93004A11CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 448FC6412A1E21BD0072C52E /* Judo3DS2_iOS.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Judo3DS2_iOS.xcframework; path = Carthage/Build/Judo3DS2_iOS.xcframework; sourceTree = ""; }; + 448FC6412A1E21BD0072C52E /* Judo3DS2_iOS.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:95V535S6TQ:Alternative Payments Ltd"; lastKnownFileType = wrapper.xcframework; name = Judo3DS2_iOS.xcframework; path = Carthage/Build/Judo3DS2_iOS.xcframework; sourceTree = ""; }; 449495032450ED870050C6A0 /* ObjectiveCExampleApp.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = ObjectiveCExampleApp.entitlements; sourceTree = ""; }; 449495042450ED870050C6A0 /* ExampleAppCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExampleAppCredentials.h; sourceTree = ""; }; 4494950D2450ED870050C6A0 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; 4494950E2450ED870050C6A0 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = ""; }; - ADFF51D82847A83D00DA884C /* DeviceDNA.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DeviceDNA.xcframework; path = Carthage/Build/DeviceDNA.xcframework; sourceTree = ""; }; + ADFF51D82847A83D00DA884C /* DeviceDNA.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:95V535S6TQ:Alternative Payments Ltd"; lastKnownFileType = wrapper.xcframework; name = DeviceDNA.xcframework; path = Carthage/Build/DeviceDNA.xcframework; sourceTree = ""; }; ADFF51DB2847A84F00DA884C /* TrustKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TrustKit.xcframework; path = Carthage/Build/TrustKit.xcframework; sourceTree = ""; }; ADFF51DE2847A85F00DA884C /* JudoKit_iOS.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = JudoKit_iOS.xcframework; path = Carthage/Build/JudoKit_iOS.xcframework; sourceTree = ""; }; - ADFF51E12847A9A400DA884C /* OpenSSL.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = Carthage/Build/OpenSSL.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -90,7 +88,6 @@ 448FC6422A1E21BD0072C52E /* Judo3DS2_iOS.xcframework in Frameworks */, ADFF51D92847A83D00DA884C /* DeviceDNA.xcframework in Frameworks */, ADFF51DC2847A84F00DA884C /* TrustKit.xcframework in Frameworks */, - ADFF51E22847A9A400DA884C /* OpenSSL.xcframework in Frameworks */, ADFF51DF2847A85F00DA884C /* JudoKit_iOS.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -136,6 +133,7 @@ 448AB1A02450DE8F004A11CB /* CarthageExampleApp */ = { isa = PBXGroup; children = ( + 44469A712BFDF80200F922B8 /* PrivacyInfo.xcprivacy */, 448AB1B32450DE93004A11CB /* main.m */, 448AB1A12450DE8F004A11CB /* AppDelegate.h */, 448AB1A22450DE8F004A11CB /* AppDelegate.m */, @@ -187,7 +185,6 @@ isa = PBXGroup; children = ( 448FC6412A1E21BD0072C52E /* Judo3DS2_iOS.xcframework */, - ADFF51E12847A9A400DA884C /* OpenSSL.xcframework */, ADFF51DE2847A85F00DA884C /* JudoKit_iOS.xcframework */, ADFF51DB2847A84F00DA884C /* TrustKit.xcframework */, ADFF51D82847A83D00DA884C /* DeviceDNA.xcframework */, @@ -302,6 +299,7 @@ files = ( 448AB1B12450DE93004A11CB /* LaunchScreen.storyboard in Resources */, 448AB1AE2450DE93004A11CB /* Assets.xcassets in Resources */, + 44469A722BFDF80200F922B8 /* PrivacyInfo.xcprivacy in Resources */, 448AB1AC2450DE8F004A11CB /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Examples/CarthageExampleApp/CarthageExampleApp/PrivacyInfo.xcprivacy b/Examples/CarthageExampleApp/CarthageExampleApp/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..e6c03e5ed --- /dev/null +++ b/Examples/CarthageExampleApp/CarthageExampleApp/PrivacyInfo.xcprivacy @@ -0,0 +1,17 @@ + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + + + \ No newline at end of file diff --git a/Examples/ObjectiveCExampleApp/ObjectiveCExampleApp.xcodeproj/project.pbxproj b/Examples/ObjectiveCExampleApp/ObjectiveCExampleApp.xcodeproj/project.pbxproj index 0b8609e96..7b56f82e0 100644 --- a/Examples/ObjectiveCExampleApp/ObjectiveCExampleApp.xcodeproj/project.pbxproj +++ b/Examples/ObjectiveCExampleApp/ObjectiveCExampleApp.xcodeproj/project.pbxproj @@ -32,6 +32,7 @@ 4494951A2450ED870050C6A0 /* Settings.m in Sources */ = {isa = PBXBuildFile; fileRef = 449495132450ED870050C6A0 /* Settings.m */; }; 4494951B2450ED870050C6A0 /* DemoFeature.m in Sources */ = {isa = PBXBuildFile; fileRef = 449495142450ED870050C6A0 /* DemoFeature.m */; }; 44A826ED269CEBC900AD5229 /* UIViewController+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A826EC269CE81C00AD5229 /* UIViewController+Additions.m */; }; + 44ABF2832BFC8D79002E8B2C /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 44ABF2822BFC8D79002E8B2C /* PrivacyInfo.xcprivacy */; }; 992C3BA82ACAC77C0029DB86 /* CreatePaymentSessionRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 992C3BA72ACAC77C0029DB86 /* CreatePaymentSessionRequest.m */; }; 9A681C6F059E48D8D97E1C2A /* Pods_ObjectiveCExampleApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963CC5C6C13F8235BB225A1A /* Pods_ObjectiveCExampleApp.framework */; }; A75B3B9103686DE365D7A95F /* IASKAppSettingsViewController+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = A75B3C163F90E3879486071F /* IASKAppSettingsViewController+Additions.m */; }; @@ -117,6 +118,7 @@ 449495242450F15C0050C6A0 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Main.strings"; sourceTree = ""; }; 44A826EB269CE7EC00AD5229 /* UIViewController+Additions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIViewController+Additions.h"; sourceTree = ""; }; 44A826EC269CE81C00AD5229 /* UIViewController+Additions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+Additions.m"; sourceTree = ""; }; + 44ABF2822BFC8D79002E8B2C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 78DA82925C80FB83F6C40732 /* Pods_ObjectiveCExampleAppTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ObjectiveCExampleAppTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 79D3F2F9461483880E68B818 /* Pods-ObjectiveCExampleAppUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ObjectiveCExampleAppUITests.release.xcconfig"; path = "Target Support Files/Pods-ObjectiveCExampleAppUITests/Pods-ObjectiveCExampleAppUITests.release.xcconfig"; sourceTree = ""; }; 963CC5C6C13F8235BB225A1A /* Pods_ObjectiveCExampleApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ObjectiveCExampleApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -271,6 +273,7 @@ 448AB1AF2450DE93004A11CB /* LaunchScreen.storyboard */, 4494950F2450ED870050C6A0 /* Settings.bundle */, 448AB1B22450DE93004A11CB /* Info.plist */, + 44ABF2822BFC8D79002E8B2C /* PrivacyInfo.xcprivacy */, ); path = ObjectiveCExampleApp; sourceTree = ""; @@ -524,6 +527,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 44ABF2832BFC8D79002E8B2C /* PrivacyInfo.xcprivacy in Resources */, 448AB1B12450DE93004A11CB /* LaunchScreen.storyboard in Resources */, 448AB1AE2450DE93004A11CB /* Assets.xcassets in Resources */, 449495192450ED870050C6A0 /* Settings.bundle in Resources */, @@ -876,7 +880,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.4.0; + MARKETING_VERSION = 3.4.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.judo.JudoPayDemoObjC; PRODUCT_MODULE_NAME = JudoKit; @@ -908,7 +912,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.4.0; + MARKETING_VERSION = 3.4.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.judo.JudoPayDemoObjC; PRODUCT_MODULE_NAME = JudoKit; diff --git a/Examples/ObjectiveCExampleApp/ObjectiveCExampleApp/PrivacyInfo.xcprivacy b/Examples/ObjectiveCExampleApp/ObjectiveCExampleApp/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..e6c03e5ed --- /dev/null +++ b/Examples/ObjectiveCExampleApp/ObjectiveCExampleApp/PrivacyInfo.xcprivacy @@ -0,0 +1,17 @@ + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + + + \ No newline at end of file diff --git a/Examples/ObjectiveCExampleApp/Podfile b/Examples/ObjectiveCExampleApp/Podfile index 16a2f1ddf..a3ec42d58 100644 --- a/Examples/ObjectiveCExampleApp/Podfile +++ b/Examples/ObjectiveCExampleApp/Podfile @@ -4,11 +4,13 @@ use_frameworks! inhibit_all_warnings! target 'ObjectiveCExampleApp' do -# pod 'Judo3DS2_iOS', :path => '../../../Judo3DS2-iOS-Source' - pod 'Judo3DS2_iOS', '1.2.0' + # pod 'Judo3DS2_iOS', :path => '../../../Judo3DS2-iOS-Source' + # pod 'DeviceDNA', :path => '../../../DeviceDNA-iOS-Source' + + pod 'Judo3DS2_iOS', '1.2.1' pod 'JudoKit-iOS', :path => '../../' - # pod 'JudoKit-iOS', '3.4.0' + # pod 'JudoKit-iOS', '3.4.1' pod 'MaterialComponents/Snackbar' pod 'InAppSettingsKit', '3.3.6' diff --git a/Examples/ObjectiveCExampleApp/Podfile.lock b/Examples/ObjectiveCExampleApp/Podfile.lock index 9343d28e8..d1c5c445e 100644 --- a/Examples/ObjectiveCExampleApp/Podfile.lock +++ b/Examples/ObjectiveCExampleApp/Podfile.lock @@ -1,13 +1,12 @@ PODS: - - DeviceDNA (2.1.0): - - OpenSSL-Universal (~> 1.1.2200) + - DeviceDNA (2.1.1) - InAppSettingsKit (3.3.6) - - Judo3DS2_iOS (1.2.0) - - JudoKit-iOS (3.4.0): - - DeviceDNA (~> 2.1.0) - - Judo3DS2_iOS (~> 1.2.0) - - RavelinEncrypt (= 1.1.1) - - TrustKit + - Judo3DS2_iOS (1.2.1) + - JudoKit-iOS (3.4.1): + - DeviceDNA (= 2.1.1) + - Judo3DS2_iOS (= 1.2.1) + - RavelinEncrypt (= 1.1.2) + - TrustKit (~> 3.0.4) - MaterialComponents/AnimationTiming (124.2.0) - MaterialComponents/Availability (124.2.0) - MaterialComponents/Buttons (124.2.0): @@ -77,14 +76,13 @@ PODS: - MDFTextAccessibility - MDFInternationalization (3.0.0) - MDFTextAccessibility (2.0.1) - - OpenSSL-Universal (1.1.2200) - - RavelinEncrypt (1.1.1) + - RavelinEncrypt (1.1.2) - TrustKit (3.0.4) - Wormholy (1.7.0) DEPENDENCIES: - InAppSettingsKit (= 3.3.6) - - Judo3DS2_iOS (= 1.2.0) + - Judo3DS2_iOS (= 1.2.1) - JudoKit-iOS (from `../../`) - MaterialComponents/Snackbar - Wormholy @@ -97,7 +95,6 @@ SPEC REPOS: - MaterialComponents - MDFInternationalization - MDFTextAccessibility - - OpenSSL-Universal - RavelinEncrypt - TrustKit - Wormholy @@ -107,18 +104,17 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - DeviceDNA: 718c566c898e3000eb9cccd7ab23d824a18d6075 + DeviceDNA: 33d9bfba987f7bd456a1d4ab8c36741c4ecfbf98 InAppSettingsKit: 37df0b44132380d4c7db6fc7cded92997e29873a - Judo3DS2_iOS: 51dcd1c113e0bc41164947deacdceb4d76da533a - JudoKit-iOS: 9ea2ad1b870d5281ea2afc5fde48ed7b1d8fb4eb + Judo3DS2_iOS: e25ae02aeb3e2a15c33bc9b9c07b1091cf296355 + JudoKit-iOS: 178a90e0abf4d0d8c630bb9a1518a4c61bf2a6fa MaterialComponents: 1a9b2d9d45b1601ae544de85089adc4c464306d4 MDFInternationalization: d697c55307816222a55685c4ccb1044ffb030c12 MDFTextAccessibility: f4bb4cc2194286651b59a215fdeaa0e05dc90ba5 - OpenSSL-Universal: 6e1ae0555546e604dbc632a2b9a24a9c46c41ef6 - RavelinEncrypt: 343327b88f39802bc269ae00da831a801982388b + RavelinEncrypt: ea533da1cb48ccf84382cb161979b27bfb23d467 TrustKit: 403e8d2cfbff2abfc37cd41acc558dab8ec78e59 Wormholy: ab1c8c2f02f58587a0941deb0088555ffbf039a1 -PODFILE CHECKSUM: f944093a4886679bb46db9389582aa9c6aa95ed8 +PODFILE CHECKSUM: 5cc1c4b800992001fa14d9fbb8bf1afd61448bf2 COCOAPODS: 1.15.2 diff --git a/Examples/SPMExampleApp/SPMExampleApp.xcodeproj/project.pbxproj b/Examples/SPMExampleApp/SPMExampleApp.xcodeproj/project.pbxproj index c08007303..9696479cd 100644 --- a/Examples/SPMExampleApp/SPMExampleApp.xcodeproj/project.pbxproj +++ b/Examples/SPMExampleApp/SPMExampleApp.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 44121C0A2AE24F36004F36CF /* JudoKit_iOS in Frameworks */ = {isa = PBXBuildFile; productRef = 44121C092AE24F36004F36CF /* JudoKit_iOS */; }; + 44469A742BFDF8FF00F922B8 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 44469A732BFDF8FF00F922B8 /* PrivacyInfo.xcprivacy */; }; AD3CCE0A283B987F008A334A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3CCE09283B987F008A334A /* AppDelegate.swift */; }; AD3CCE0C283B987F008A334A /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3CCE0B283B987F008A334A /* SceneDelegate.swift */; }; AD3CCE0E283B987F008A334A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD3CCE0D283B987F008A334A /* ViewController.swift */; }; @@ -17,6 +18,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 44469A732BFDF8FF00F922B8 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; AD3CCE06283B987F008A334A /* SPMExampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SPMExampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; AD3CCE09283B987F008A334A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; AD3CCE0B283B987F008A334A /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -58,6 +60,7 @@ AD3CCE08283B987F008A334A /* SPMExampleApp */ = { isa = PBXGroup; children = ( + 44469A732BFDF8FF00F922B8 /* PrivacyInfo.xcprivacy */, AD3CCE09283B987F008A334A /* AppDelegate.swift */, AD3CCE0B283B987F008A334A /* SceneDelegate.swift */, AD3CCE0D283B987F008A334A /* ViewController.swift */, @@ -135,6 +138,7 @@ files = ( AD3CCE16283B987F008A334A /* LaunchScreen.storyboard in Resources */, AD3CCE13283B987F008A334A /* Assets.xcassets in Resources */, + 44469A742BFDF8FF00F922B8 /* PrivacyInfo.xcprivacy in Resources */, AD3CCE11283B987F008A334A /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Examples/SPMExampleApp/SPMExampleApp/PrivacyInfo.xcprivacy b/Examples/SPMExampleApp/SPMExampleApp/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..e6c03e5ed --- /dev/null +++ b/Examples/SPMExampleApp/SPMExampleApp/PrivacyInfo.xcprivacy @@ -0,0 +1,17 @@ + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + + + \ No newline at end of file diff --git a/Examples/SwiftExampleApp/Podfile b/Examples/SwiftExampleApp/Podfile index 1da3ad722..cebca3846 100644 --- a/Examples/SwiftExampleApp/Podfile +++ b/Examples/SwiftExampleApp/Podfile @@ -5,7 +5,7 @@ inhibit_all_warnings! target 'SwiftExampleApp' do # pod 'Judo3DS2_iOS', :path => '../../../Judo3DS2-iOS-Source' - pod 'Judo3DS2_iOS', '1.2.0' + pod 'Judo3DS2_iOS', '1.2.1' pod 'JudoKit-iOS', :path => '../../' pod 'InAppSettingsKit', '3.3.6' diff --git a/Examples/SwiftExampleApp/Podfile.lock b/Examples/SwiftExampleApp/Podfile.lock index 1f0f633ea..4a065945a 100644 --- a/Examples/SwiftExampleApp/Podfile.lock +++ b/Examples/SwiftExampleApp/Podfile.lock @@ -1,22 +1,20 @@ PODS: - - DeviceDNA (2.1.0): - - OpenSSL-Universal (~> 1.1.2200) + - DeviceDNA (2.1.1) - InAppSettingsKit (3.3.6) - - Judo3DS2_iOS (1.2.0) - - JudoKit-iOS (3.4.0): - - DeviceDNA (~> 2.1.0) - - Judo3DS2_iOS (~> 1.2.0) - - RavelinEncrypt (= 1.1.1) - - TrustKit - - OpenSSL-Universal (1.1.2200) - - RavelinEncrypt (1.1.1) - - SwiftLint (0.54.0) + - Judo3DS2_iOS (1.2.1) + - JudoKit-iOS (3.4.1): + - DeviceDNA (= 2.1.1) + - Judo3DS2_iOS (= 1.2.1) + - RavelinEncrypt (= 1.1.2) + - TrustKit (~> 3.0.4) + - RavelinEncrypt (1.1.2) + - SwiftLint (0.55.1) - TrustKit (3.0.4) - Wormholy (1.7.0) DEPENDENCIES: - InAppSettingsKit (= 3.3.6) - - Judo3DS2_iOS (= 1.2.0) + - Judo3DS2_iOS (= 1.2.1) - JudoKit-iOS (from `../../`) - SwiftLint - Wormholy @@ -26,7 +24,6 @@ SPEC REPOS: - DeviceDNA - InAppSettingsKit - Judo3DS2_iOS - - OpenSSL-Universal - RavelinEncrypt - SwiftLint - TrustKit @@ -37,16 +34,15 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - DeviceDNA: 718c566c898e3000eb9cccd7ab23d824a18d6075 + DeviceDNA: 33d9bfba987f7bd456a1d4ab8c36741c4ecfbf98 InAppSettingsKit: 37df0b44132380d4c7db6fc7cded92997e29873a - Judo3DS2_iOS: 51dcd1c113e0bc41164947deacdceb4d76da533a - JudoKit-iOS: 9ea2ad1b870d5281ea2afc5fde48ed7b1d8fb4eb - OpenSSL-Universal: 6e1ae0555546e604dbc632a2b9a24a9c46c41ef6 - RavelinEncrypt: 343327b88f39802bc269ae00da831a801982388b - SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211 + Judo3DS2_iOS: e25ae02aeb3e2a15c33bc9b9c07b1091cf296355 + JudoKit-iOS: 178a90e0abf4d0d8c630bb9a1518a4c61bf2a6fa + RavelinEncrypt: ea533da1cb48ccf84382cb161979b27bfb23d467 + SwiftLint: 3fe909719babe5537c552ee8181c0031392be933 TrustKit: 403e8d2cfbff2abfc37cd41acc558dab8ec78e59 Wormholy: ab1c8c2f02f58587a0941deb0088555ffbf039a1 -PODFILE CHECKSUM: 9d868ac442369877e6c520191f2fb55b8b71b042 +PODFILE CHECKSUM: bc1b07ddf89ec7c7e4df69b68b2323dbc795cadf COCOAPODS: 1.15.2 diff --git a/Examples/SwiftExampleApp/SwiftExampleApp.xcodeproj/project.pbxproj b/Examples/SwiftExampleApp/SwiftExampleApp.xcodeproj/project.pbxproj index f224477ef..30cd88281 100644 --- a/Examples/SwiftExampleApp/SwiftExampleApp.xcodeproj/project.pbxproj +++ b/Examples/SwiftExampleApp/SwiftExampleApp.xcodeproj/project.pbxproj @@ -32,6 +32,7 @@ 30585427257FABA4000B00DF /* UIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30585426257FABA4000B00DF /* UIViewController+Additions.swift */; }; 30FF8EB5259B37200077B5C8 /* ApplePayModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FF8EB4259B37200077B5C8 /* ApplePayModule.swift */; }; 30FF8EBA259B37290077B5C8 /* ApplePayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30FF8EB9259B37290077B5C8 /* ApplePayViewController.swift */; }; + 44469A762BFDF92400F922B8 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 44469A752BFDF92400F922B8 /* PrivacyInfo.xcprivacy */; }; 448AB1E32450DF22004A11CB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 448AB1E22450DF22004A11CB /* AppDelegate.swift */; }; 448AB1EC2450DF24004A11CB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 448AB1EB2450DF24004A11CB /* Assets.xcassets */; }; 448AB1EF2450DF24004A11CB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 448AB1ED2450DF24004A11CB /* LaunchScreen.storyboard */; }; @@ -93,6 +94,7 @@ 30585426257FABA4000B00DF /* UIViewController+Additions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Additions.swift"; sourceTree = ""; }; 30FF8EB4259B37200077B5C8 /* ApplePayModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplePayModule.swift; sourceTree = ""; }; 30FF8EB9259B37290077B5C8 /* ApplePayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplePayViewController.swift; sourceTree = ""; }; + 44469A752BFDF92400F922B8 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 448AB1DF2450DF22004A11CB /* JudoKit (Swift).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JudoKit (Swift).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 448AB1E22450DF22004A11CB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 448AB1EB2450DF24004A11CB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -290,6 +292,7 @@ 448AB1E12450DF22004A11CB /* SwiftExampleApp */ = { isa = PBXGroup; children = ( + 44469A752BFDF92400F922B8 /* PrivacyInfo.xcprivacy */, 4494952E2450F6A90050C6A0 /* SwiftExampleApp.entitlements */, 30585425257FAB89000B00DF /* Extensions */, 305853B6257F79AF000B00DF /* Modules */, @@ -465,6 +468,7 @@ files = ( 448AB1EF2450DF24004A11CB /* LaunchScreen.storyboard in Resources */, 305687172581014600195C93 /* Settings.bundle in Resources */, + 44469A762BFDF92400F922B8 /* PrivacyInfo.xcprivacy in Resources */, 448AB1EC2450DF24004A11CB /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Examples/SwiftExampleApp/SwiftExampleApp/PrivacyInfo.xcprivacy b/Examples/SwiftExampleApp/SwiftExampleApp/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..e6c03e5ed --- /dev/null +++ b/Examples/SwiftExampleApp/SwiftExampleApp/PrivacyInfo.xcprivacy @@ -0,0 +1,17 @@ + + + + + NSPrivacyAccessedAPITypes + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + + + \ No newline at end of file diff --git a/Gemfile b/Gemfile index 781188f82..349d945c6 100644 --- a/Gemfile +++ b/Gemfile @@ -5,5 +5,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } gem 'cocoapods' gem 'fastlane' +# temporary workaround: https://github.com/fastlane/fastlane/issues/21794#issuecomment-2102563823 +gem 'rb-readline' + plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock index ae7316149..cf05e866f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,12 +5,16 @@ GEM base64 nkf rexml - activesupport (6.1.7.7) + activesupport (7.1.3.3) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) @@ -19,23 +23,24 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.920.0) - aws-sdk-core (3.193.0) + aws-partitions (1.932.0) + aws-sdk-core (3.196.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.80.0) + aws-sdk-kms (1.81.0) aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.148.0) - aws-sdk-core (~> 3, >= 3.193.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) + bigdecimal (3.1.8) claide (1.1.0) cocoapods (1.15.2) addressable (~> 2.8) @@ -79,17 +84,18 @@ GEM commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.2.3) + connection_pool (2.4.1) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20240107) dotenv (2.8.1) + drb (2.2.1) emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.109.0) + excon (0.110.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -160,7 +166,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) - fastlane-plugin-firebase_app_distribution (0.9.0) + fastlane-plugin-firebase_app_distribution (0.9.1) google-apis-firebaseappdistribution_v1 (~> 0.3.0) google-apis-firebaseappdistribution_v1alpha (~> 0.2.0) ffi (1.16.3) @@ -185,19 +191,19 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.29.0) + google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.1) + google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-storage (1.45.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.29.0) + google-apis-storage_v1 (~> 0.31.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) @@ -211,7 +217,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) jmespath (1.6.2) json (2.7.2) @@ -219,10 +225,11 @@ GEM base64 mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.23.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) + mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) naturally (2.2.1) @@ -233,18 +240,20 @@ GEM plist (3.7.1) public_suffix (4.0.7) rake (13.2.1) + rb-readline (0.5.5) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.5) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -252,6 +261,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -265,9 +275,6 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) unicode-display_width (2.5.0) word_wrap (1.0.0) xcodeproj (1.24.0) @@ -281,15 +288,16 @@ GEM rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.6.13) PLATFORMS + arm64-darwin-23 ruby DEPENDENCIES cocoapods fastlane fastlane-plugin-firebase_app_distribution + rb-readline BUNDLED WITH - 2.0.2 + 2.5.9 diff --git a/JudoKit-iOS.podspec b/JudoKit-iOS.podspec index 21d48735d..f665f653f 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.4.0' + s.version = '3.4.1' s.summary = 'Judo Pay Full iOS Client Kit' s.homepage = 'https://www.judopay.com/' s.license = 'MIT' @@ -14,13 +14,13 @@ Pod::Spec.new do |s| s.source_files = 'Source/**/*.{m,h}' s.exclude_files = 'Source/include/' - s.dependency 'DeviceDNA', '2.1.0' - s.dependency 'TrustKit' - s.dependency 'Judo3DS2_iOS', '1.2.0' - s.dependency 'RavelinEncrypt', '1.1.1' + s.dependency 'DeviceDNA', '2.1.1' + s.dependency 'TrustKit', '~> 3.0.4' + s.dependency 'Judo3DS2_iOS', '1.2.1' + s.dependency 'RavelinEncrypt', '1.1.2' s.frameworks = 'CoreLocation', 'Security', 'CoreTelephony', 'Vision' s.ios.resource_bundle = { - 'JudoKit_iOS' => 'Source/Resources/**/*.{lproj,png,json,strings}' + 'JudoKit_iOS' => 'Source/Resources/**/*.{lproj,png,json,strings,xcprivacy}' } end diff --git a/JudoKit_iOS.xcodeproj/project.pbxproj b/JudoKit_iOS.xcodeproj/project.pbxproj index ec3a172e1..5cd611bab 100644 --- a/JudoKit_iOS.xcodeproj/project.pbxproj +++ b/JudoKit_iOS.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -395,6 +395,7 @@ 44A18B6529F94DE700D2963B /* JPCardDetailsForm.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A18B6329F94DE700D2963B /* JPCardDetailsForm.m */; }; 44A18B6829F94F3800D2963B /* JPIntrinsicSizeAwareScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 44A18B6629F94F3800D2963B /* JPIntrinsicSizeAwareScrollView.h */; }; 44A18B6929F94F3800D2963B /* JPIntrinsicSizeAwareScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 44A18B6729F94F3800D2963B /* JPIntrinsicSizeAwareScrollView.m */; }; + 44A490172BFBE1CE007C5743 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 44A490162BFBE1CE007C5743 /* PrivacyInfo.xcprivacy */; }; 44CD3A792B1F454300002FBB /* JPRecurringPaymentRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 44CD3A742B1F454300002FBB /* JPRecurringPaymentRequest.m */; }; 44CD3A7A2B1F454300002FBB /* JPRecurringPaymentRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 44CD3A752B1F454300002FBB /* JPRecurringPaymentRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; 44CD3A7B2B1F454300002FBB /* JPRecurringPaymentSummaryItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 44CD3A772B1F454300002FBB /* JPRecurringPaymentSummaryItem.m */; }; @@ -503,7 +504,6 @@ ADB514BB286DED4200332E47 /* JPCReqParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = ADB514B9286DED4200332E47 /* JPCReqParameters.m */; }; ADB514BF286DF03900332E47 /* JPThreeDSecureTwo.m in Sources */ = {isa = PBXBuildFile; fileRef = ADB514BD286DF03900332E47 /* JPThreeDSecureTwo.m */; }; ADB514C0286DF03900332E47 /* JPThreeDSecureTwo.h in Headers */ = {isa = PBXBuildFile; fileRef = ADB514BE286DF03900332E47 /* JPThreeDSecureTwo.h */; }; - ADB5FB46282CF72500B0E4BE /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = ADA50D79282C35DE00846943 /* OpenSSL.xcframework */; }; ADC5AC0228EF30340049CAE3 /* JPState.m in Sources */ = {isa = PBXBuildFile; fileRef = ADC5AC0128EF30340049CAE3 /* JPState.m */; }; ADC5AC0428EF30610049CAE3 /* JPState.h in Headers */ = {isa = PBXBuildFile; fileRef = ADC5AC0328EF30500049CAE3 /* JPState.h */; settings = {ATTRIBUTES = (Public, ); }; }; ADFDB81729EAE8E80011C62F /* JPSubProductInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = ADFDB81629EAE8E80011C62F /* JPSubProductInfo.m */; }; @@ -807,7 +807,7 @@ 3B678BC71C735AB80001DC2F /* JudoKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = JudoKit.h; sourceTree = ""; }; 3B678BC81C735AB80001DC2F /* JudoKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JudoKit.m; sourceTree = ""; }; 4416C39D2451A4060002870C /* JudoKit_iOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JudoKit_iOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 4428AF002B06177100DCE4FB /* RavelinEncrypt.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RavelinEncrypt.xcframework; path = Carthage/Build/RavelinEncrypt.xcframework; sourceTree = ""; }; + 4428AF002B06177100DCE4FB /* RavelinEncrypt.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:8SLW46D7RN:Ravelin Technology Ltd"; lastKnownFileType = wrapper.xcframework; name = RavelinEncrypt.xcframework; path = Carthage/Build/RavelinEncrypt.xcframework; sourceTree = ""; }; 4428AF072B06262E00DCE4FB /* JPRecommendationOptimisationExemption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPRecommendationOptimisationExemption.h; sourceTree = ""; }; 4428AF082B06262E00DCE4FB /* JPTransactionOptimisation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPTransactionOptimisation.m; sourceTree = ""; }; 4428AF0A2B06262E00DCE4FB /* JPTransactionOptimisation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPTransactionOptimisation.h; sourceTree = ""; }; @@ -915,6 +915,7 @@ 44A18B6329F94DE700D2963B /* JPCardDetailsForm.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JPCardDetailsForm.m; sourceTree = ""; }; 44A18B6629F94F3800D2963B /* JPIntrinsicSizeAwareScrollView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JPIntrinsicSizeAwareScrollView.h; sourceTree = ""; }; 44A18B6729F94F3800D2963B /* JPIntrinsicSizeAwareScrollView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JPIntrinsicSizeAwareScrollView.m; sourceTree = ""; }; + 44A490162BFBE1CE007C5743 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 44CD3A742B1F454300002FBB /* JPRecurringPaymentRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPRecurringPaymentRequest.m; sourceTree = ""; }; 44CD3A752B1F454300002FBB /* JPRecurringPaymentRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPRecurringPaymentRequest.h; sourceTree = ""; }; 44CD3A772B1F454300002FBB /* JPRecurringPaymentSummaryItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JPRecurringPaymentSummaryItem.m; sourceTree = ""; }; @@ -1012,10 +1013,9 @@ AD13DC0728831297002B82CD /* JPNetworkTimeout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPNetworkTimeout.h; sourceTree = ""; }; AD13DC1728831C07002B82CD /* JPPaymentMethodsTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JPPaymentMethodsTest.swift; sourceTree = ""; }; ADA50D6D282C1C7B00846943 /* OHHTTPStubs.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OHHTTPStubs.xcframework; path = Carthage/Build/OHHTTPStubs.xcframework; sourceTree = ""; }; - ADA50D6E282C1C7B00846943 /* DeviceDNA.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = DeviceDNA.xcframework; path = Carthage/Build/DeviceDNA.xcframework; sourceTree = ""; }; + ADA50D6E282C1C7B00846943 /* DeviceDNA.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:95V535S6TQ:Alternative Payments Ltd"; lastKnownFileType = wrapper.xcframework; name = DeviceDNA.xcframework; path = Carthage/Build/DeviceDNA.xcframework; sourceTree = ""; }; ADA50D6F282C1C7B00846943 /* TrustKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = TrustKit.xcframework; path = Carthage/Build/TrustKit.xcframework; sourceTree = ""; }; - ADA50D79282C35DE00846943 /* OpenSSL.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = Carthage/Build/OpenSSL.xcframework; sourceTree = ""; }; - ADB514A9286DE90100332E47 /* Judo3DS2_iOS.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Judo3DS2_iOS.xcframework; path = Carthage/Build/Judo3DS2_iOS.xcframework; sourceTree = ""; }; + ADB514A9286DE90100332E47 /* Judo3DS2_iOS.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:95V535S6TQ:Alternative Payments Ltd"; lastKnownFileType = wrapper.xcframework; name = Judo3DS2_iOS.xcframework; path = Carthage/Build/Judo3DS2_iOS.xcframework; sourceTree = ""; }; ADB514AE286DECB600332E47 /* JPResponse+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JPResponse+Additions.m"; sourceTree = ""; }; ADB514AF286DECB600332E47 /* JPResponse+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JPResponse+Additions.h"; sourceTree = ""; }; ADB514B3286DECE300332E47 /* JPCardTransactionDetails+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JPCardTransactionDetails+Additions.h"; sourceTree = ""; }; @@ -1035,7 +1035,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - ADB5FB46282CF72500B0E4BE /* OpenSSL.xcframework in Frameworks */, ADB514AA286DE90100332E47 /* Judo3DS2_iOS.xcframework in Frameworks */, 525FF51B25307B89001F030E /* Vision.framework in Frameworks */, 4428AF012B06177100DCE4FB /* RavelinEncrypt.xcframework in Frameworks */, @@ -1534,7 +1533,6 @@ children = ( 4428AF002B06177100DCE4FB /* RavelinEncrypt.xcframework */, ADB514A9286DE90100332E47 /* Judo3DS2_iOS.xcframework */, - ADA50D79282C35DE00846943 /* OpenSSL.xcframework */, ADA50D6E282C1C7B00846943 /* DeviceDNA.xcframework */, ADA50D6D282C1C7B00846943 /* OHHTTPStubs.xcframework */, ADA50D6F282C1C7B00846943 /* TrustKit.xcframework */, @@ -3203,6 +3201,7 @@ 52FBFB6A2325A3770096064C /* Resources */ = { isa = PBXGroup; children = ( + 44A490162BFBE1CE007C5743 /* PrivacyInfo.xcprivacy */, 448FC5E52A1E1F3A0072C52E /* Images */, 448FC5E32A1E1F3A0072C52E /* JSON */, 829330FE230AF0F900689DC4 /* Localizable.strings */, @@ -3648,6 +3647,7 @@ 448FC6192A1E1F3B0072C52E /* ideal-pay-icon.png in Resources */, 448FC6262A1E1F3B0072C52E /* card-unionpay.png in Resources */, 448FC6292A1E1F3B0072C52E /* pbba-pay-icon@3x.png in Resources */, + 44A490172BFBE1CE007C5743 /* PrivacyInfo.xcprivacy in Resources */, 448FC62D2A1E1F3B0072C52E /* logo-triodos.png in Resources */, 448FC6142A1E1F3B0072C52E /* pattern-lines.png in Resources */, 448FC61B2A1E1F3B0072C52E /* gradient-background.png in Resources */, diff --git a/Package.resolved b/Package.resolved index 11b2a7572..fa095f687 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Judopay/DeviceDNA-iOS", "state" : { - "revision" : "704e6b1f8a63fad2d41baefe3313ee25095023e2", - "version" : "2.1.0" + "revision" : "bdfcec20efb2ee927bc4a589dc9b560cb4d24483", + "version" : "2.1.1" } }, { @@ -14,17 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Judopay/Judo3DS2-iOS", "state" : { - "revision" : "2324075db868a6b5755a81ff6ea89af80b4d8768", - "version" : "1.2.0" - } - }, - { - "identity" : "openssl", - "kind" : "remoteSourceControl", - "location" : "https://github.com/krzyzanowskim/OpenSSL", - "state" : { - "revision" : "0faf71a188bcfdf0245cab42886b9b240ca71c52", - "version" : "1.1.2200" + "revision" : "b248892251adab326d01de7767fb9cea5f4da663", + "version" : "1.2.1" } }, { @@ -32,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/unravelin/ravelin-encrypt-ios-xcframework-distribution", "state" : { - "revision" : "92799d81e6856c41903573a507ebab5a58125ccf", - "version" : "1.1.1" + "revision" : "53e8292982546accc2704eaecdc37039f26ecd3b", + "version" : "1.1.2" } }, { @@ -41,8 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/datatheorem/TrustKit", "state" : { - "revision" : "5718ba8720b4dafc5360aebfbc9762e2d5f2615e", - "version" : "3.0.3" + "revision" : "2fb6ce731fd51f745f6cc3393462865b95c3df3c", + "version" : "3.0.4" } } ], diff --git a/Package.swift b/Package.swift index 8993a7aba..df50c6e8e 100644 --- a/Package.swift +++ b/Package.swift @@ -15,10 +15,10 @@ let package = Package( targets: ["JudoKit_iOS"]) ], dependencies: [ - .package(url: "https://github.com/Judopay/DeviceDNA-iOS", exact: "2.1.0"), - .package(url: "https://github.com/Judopay/Judo3DS2-iOS", exact: "1.2.0"), - .package(url: "https://github.com/datatheorem/TrustKit", exact: "3.0.3"), - .package(url: "https://github.com/unravelin/ravelin-encrypt-ios-xcframework-distribution", exact: "1.1.1") + .package(url: "https://github.com/Judopay/DeviceDNA-iOS", exact: "2.1.1"), + .package(url: "https://github.com/Judopay/Judo3DS2-iOS", exact: "1.2.1"), + .package(url: "https://github.com/datatheorem/TrustKit", from: "3.0.4"), + .package(url: "https://github.com/unravelin/ravelin-encrypt-ios-xcframework-distribution", exact: "1.1.2") ], targets: [ .target( diff --git a/Source/Models/Constants/JPConstants.h b/Source/Models/Constants/JPConstants.h index 41ae4840b..150eafbd1 100644 --- a/Source/Models/Constants/JPConstants.h +++ b/Source/Models/Constants/JPConstants.h @@ -28,7 +28,7 @@ #import static NSString *const kJudoKitName = @"JudoKit_iOS"; -static NSString *const kJudoKitVersion = @"3.4.0"; +static NSString *const kJudoKitVersion = @"3.4.1"; /* Patterns */ static NSString *const kDefaultPattern = @"XXXX XXXX XXXX XXXX"; diff --git a/Source/Resources/PrivacyInfo.xcprivacy b/Source/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 000000000..a3c3c5453 --- /dev/null +++ b/Source/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,39 @@ + + + + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyCollectedDataTypes + + + NSPrivacyCollectedDataType + NSPrivacyCollectedDataTypePaymentInfo + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + NSPrivacyCollectedDataTypePurposeAppFunctionality + + + + NSPrivacyCollectedDataType + NSPrivacyCollectedDataTypeCoarseLocation + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + NSPrivacyCollectedDataTypePurposeAppFunctionality + + + + NSPrivacyAccessedAPITypes + + + \ No newline at end of file