Fix a couple of warnings in the sample app after pod install (#146)

* Fix a couple of warnings in the sample app after pod install * Fix swift sample app build and a couple of cocoapod warnings
Judopay · Jul 14, 2022 · b28011a · b28011a
1 parent 5cfb2cb
commit b28011a
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 44 deletions.
diff --git a/Examples/ObjectiveCExampleApp/Podfile b/Examples/ObjectiveCExampleApp/Podfile
@@ -20,3 +20,13 @@ target 'ObjectiveCExampleApp' do
     pod 'Cucumberish', :git => 'https://github.com/mpetrenco/Cucumberish.git'
   end
 end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings.delete 'SWIFT_VERSION'
+      # https://www.jessesquires.com/blog/2020/07/20/xcode-12-drops-support-for-ios-8-fix-for-cocoapods/
+      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+    end
+  end
+end
diff --git a/Examples/ObjectiveCExampleApp/Podfile.lock b/Examples/ObjectiveCExampleApp/Podfile.lock
@@ -79,7 +79,7 @@ PODS:
     - MDFTextAccessibility
   - MDFInternationalization (3.0.0)
   - MDFTextAccessibility (2.0.1)
-  - OpenSSL-Universal (1.1.1500)
+  - OpenSSL-Universal (1.1.1700)
   - TrustKit (2.0.0)
   - ZappMerchantLib (3.1.0)
 
@@ -125,10 +125,10 @@ SPEC CHECKSUMS:
   MaterialComponents: 1a9b2d9d45b1601ae544de85089adc4c464306d4
   MDFInternationalization: d697c55307816222a55685c4ccb1044ffb030c12
   MDFTextAccessibility: f4bb4cc2194286651b59a215fdeaa0e05dc90ba5
-  OpenSSL-Universal: 5d1de8d199ea9684d7ee48a8caa38d5dbfee1981
+  OpenSSL-Universal: ee0a7a25f2042782e2df405e66db3e429198e392
   TrustKit: 610b8c71c07914756dd74c380040a3408a747798
   ZappMerchantLib: b14bc5814840426d351190309250347ca9b0983d
 
-PODFILE CHECKSUM: 318b83e3472d63980f572a1deeb22952cc3d2e82
+PODFILE CHECKSUM: e513dd98c78f189d054453334228bab058aec825
 
 COCOAPODS: 1.11.3
diff --git a/Examples/SwiftExampleApp/Podfile b/Examples/SwiftExampleApp/Podfile
@@ -1,24 +1,31 @@
-# Uncomment the next line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '12.0'
 
-target 'SwiftExampleApp' do
-  # Comment the next line if you don't want to use dynamic frameworks
-  use_frameworks!
+use_frameworks!
+inhibit_all_warnings!
 
-  # Pods for SwiftExampleApp
+target 'SwiftExampleApp' do
+  #  pod 'Judo3DS2_iOS', :path => '../../../Judo3DS2-iOS-Source'
+  pod 'Judo3DS2_iOS', '1.0.1'
   pod 'JudoKit-iOS', :path => '../../'
 
-  pod 'InAppSettingsKit'
-  pod 'CocoaDebug'
+  pod 'InAppSettingsKit', '3.3.6'
+  pod 'CocoaDebug', '1.7.2'
   pod 'SwiftLint'
 
   target 'SwiftExampleAppTests' do
     inherit! :search_paths
-    # Pods for testing
   end
 
   target 'SwiftExampleAppUITests' do
-    # Pods for testing
   end
+end
 
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings.delete 'SWIFT_VERSION'
+      # https://www.jessesquires.com/blog/2020/07/20/xcode-12-drops-support-for-ios-8-fix-for-cocoapods/
+      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+    end
+  end
 end
diff --git a/Examples/SwiftExampleApp/Podfile.lock b/Examples/SwiftExampleApp/Podfile.lock
@@ -9,14 +9,15 @@ PODS:
     - Judo3DS2_iOS (~> 1.0.1)
     - TrustKit
     - ZappMerchantLib
-  - OpenSSL-Universal (1.1.1500)
+  - OpenSSL-Universal (1.1.1700)
   - SwiftLint (0.47.1)
-  - TrustKit (1.7.0)
+  - TrustKit (2.0.0)
   - ZappMerchantLib (3.1.0)
 
 DEPENDENCIES:
-  - CocoaDebug
-  - InAppSettingsKit
+  - CocoaDebug (= 1.7.2)
+  - InAppSettingsKit (= 3.3.6)
+  - Judo3DS2_iOS (= 1.0.1)
   - JudoKit-iOS (from `../../`)
   - SwiftLint
 
@@ -41,11 +42,11 @@ SPEC CHECKSUMS:
   InAppSettingsKit: 37df0b44132380d4c7db6fc7cded92997e29873a
   Judo3DS2_iOS: c1ccf49ecacddb4559a73fb7eae6e680e2355b21
   JudoKit-iOS: ff5d3b707ad4882137f96873dc269ab0bff6e030
-  OpenSSL-Universal: 5d1de8d199ea9684d7ee48a8caa38d5dbfee1981
+  OpenSSL-Universal: ee0a7a25f2042782e2df405e66db3e429198e392
   SwiftLint: f80f1be7fa96d30e0aa68e58d45d4ea1ccaac519
-  TrustKit: dac38bb37e49bdfeca41b1a19d020da38017b51c
+  TrustKit: 610b8c71c07914756dd74c380040a3408a747798
   ZappMerchantLib: b14bc5814840426d351190309250347ca9b0983d
 
-PODFILE CHECKSUM: 5a0cc97c7830908acd116668e4e1bb6be36bae36
+PODFILE CHECKSUM: ae4a5cd2ee5d02a8ba7157baf85a3fad2e1cb094
 
 COCOAPODS: 1.11.3
diff --git a/Examples/SwiftExampleApp/SwiftExampleApp.xcodeproj/project.pbxproj b/Examples/SwiftExampleApp/SwiftExampleApp.xcodeproj/project.pbxproj
@@ -20,18 +20,15 @@
 		3056881925823CF000195C93 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3056881825823CF000195C93 /* Result.swift */; };
 		3056882125823D1300195C93 /* ResultItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3056882025823D1300195C93 /* ResultItem.swift */; };
 		305689F125836F3000195C93 /* NSObject+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305689F025836F3000195C93 /* NSObject+Additions.swift */; };
-		305689F7258377FB00195C93 /* ResultsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305689F6258377FB00195C93 /* ResultsCell.swift */; };
 		305689FC2583786700195C93 /* ResultsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305689FB2583786700195C93 /* ResultsViewModel.swift */; };
 		30568A0E2583AD8900195C93 /* TokenModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30568A0D2583AD8900195C93 /* TokenModule.swift */; };
 		30568A162583AD9200195C93 /* TokenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30568A152583AD9200195C93 /* TokenViewController.swift */; };
-		30568A1B2583AD9A00195C93 /* TokenInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30568A1A2583AD9A00195C93 /* TokenInteractor.swift */; };
 		305853B9257F79CC000B00DF /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305853B8257F79CC000B00DF /* HomeViewController.swift */; };
 		305853BF257F7C9F000B00DF /* FeatureCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305853BE257F7C9F000B00DF /* FeatureCell.swift */; };
 		305853C7257F7EC9000B00DF /* FeatureViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305853C6257F7EC9000B00DF /* FeatureViewModel.swift */; };
 		305853CF257F813D000B00DF /* HomeModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305853CE257F813D000B00DF /* HomeModule.swift */; };
 		305853D4257F8171000B00DF /* HomeInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305853D3257F8171000B00DF /* HomeInteractor.swift */; };
 		305853DC257F83D0000B00DF /* FeatureRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305853DB257F83D0000B00DF /* FeatureRepository.swift */; };
-		3058541E257F9F32000B00DF /* FeatureService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3058541D257F9F32000B00DF /* FeatureService.swift */; };
 		30585427257FABA4000B00DF /* UIViewController+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30585426257FABA4000B00DF /* UIViewController+Additions.swift */; };
 		30E1098B25877428000284CD /* PBBAModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E1098A25877428000284CD /* PBBAModule.swift */; };
 		30E1099325877436000284CD /* PBBAViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E1099225877436000284CD /* PBBAViewController.swift */; };
@@ -42,6 +39,9 @@
 		448AB1EC2450DF24004A11CB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 448AB1EB2450DF24004A11CB /* Assets.xcassets */; };
 		448AB1EF2450DF24004A11CB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 448AB1ED2450DF24004A11CB /* LaunchScreen.storyboard */; };
 		49584B8CB009346FCBBF5DC0 /* Pods_SwiftExampleApp_SwiftExampleAppUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44002E1B9DB19BC377EDE0C /* Pods_SwiftExampleApp_SwiftExampleAppUITests.framework */; };
+		ADE6EA16287F311B007448DE /* ResultsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 305689F6258377FB00195C93 /* ResultsCell.swift */; };
+		ADE6EA17287F3144007448DE /* TokenInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30568A1A2583AD9A00195C93 /* TokenInteractor.swift */; };
+		ADE6EA18287F3152007448DE /* FeatureService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3058541D257F9F32000B00DF /* FeatureService.swift */; };
 		B763B0BA0E70403D0411DB3C /* Pods_SwiftExampleAppTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C721A0EA88E53947BF0C4D32 /* Pods_SwiftExampleAppTests.framework */; };
 		C82C2B8CD5388E644731B189 /* Pods_SwiftExampleApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8FFBCF43B0E88669F4DDED3 /* Pods_SwiftExampleApp.framework */; };
 /* End PBXBuildFile section */
@@ -421,7 +421,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1140;
-				LastUpgradeCheck = 1140;
+				LastUpgradeCheck = 1340;
 				ORGANIZATIONNAME = Judopay;
 				TargetAttributes = {
 					448AB1DE2450DF22004A11CB = {
@@ -619,22 +619,22 @@
 				3056872D2581197100195C93 /* SettingsModule.swift in Sources */,
 				305687402581227500195C93 /* Settings.swift in Sources */,
 				448AB1E32450DF22004A11CB /* AppDelegate.swift in Sources */,
+				ADE6EA18287F3152007448DE /* FeatureService.swift in Sources */,
 				305687272581193500195C93 /* AppCoordinator.swift in Sources */,
 				305853B9257F79CC000B00DF /* HomeViewController.swift in Sources */,
 				30568809258238A400195C93 /* ResultsModule.swift in Sources */,
 				3056880E258238AE00195C93 /* ResultsViewController.swift in Sources */,
 				30568A162583AD9200195C93 /* TokenViewController.swift in Sources */,
+				ADE6EA16287F311B007448DE /* ResultsCell.swift in Sources */,
 				305687452581280600195C93 /* SettingsKeys.swift in Sources */,
 				30E1099325877436000284CD /* PBBAViewController.swift in Sources */,
 				3056875225812F5600195C93 /* SettingsViewController.swift in Sources */,
 				3056874D25812D9900195C93 /* IASKAppSettingsViewController+Additions.swift in Sources */,
 				305853DC257F83D0000B00DF /* FeatureRepository.swift in Sources */,
 				305689FC2583786700195C93 /* ResultsViewModel.swift in Sources */,
-				30568A1B2583AD9A00195C93 /* TokenInteractor.swift in Sources */,
-				305689F7258377FB00195C93 /* ResultsCell.swift in Sources */,
-				3058541E257F9F32000B00DF /* FeatureService.swift in Sources */,
 				30568A0E2583AD8900195C93 /* TokenModule.swift in Sources */,
 				30585427257FABA4000B00DF /* UIViewController+Additions.swift in Sources */,
+				ADE6EA17287F3144007448DE /* TokenInteractor.swift in Sources */,
 				305853D4257F8171000B00DF /* HomeInteractor.swift in Sources */,
 				305853C7257F7EC9000B00DF /* FeatureViewModel.swift in Sources */,
 				30FF8EBA259B37290077B5C8 /* ApplePayViewController.swift in Sources */,

diff --git a/Examples/SwiftExampleApp/SwiftExampleApp/Modules/Home/Services/FeatureService.swift b/Examples/SwiftExampleApp/SwiftExampleApp/Modules/Home/Services/FeatureService.swift
@@ -72,14 +72,6 @@ class FeatureService {
                                              andCompletion: completion)
     }
 
-    func handle3DSTransaction(with error: JPError,
-                              completion: @escaping JPCompletionBlock) {
-
-        let threeDSConfiguration = JP3DSConfiguration(error: error)
-        let threeDSService = JP3DSService(apiService: apiService)
-        threeDSService.invoke3DSecure(with: threeDSConfiguration, completion: completion)
-    }
-
     func invokePBBATransaction(with url: URL?,
                                completion: @escaping JPCompletionBlock) {
         let currentConfiguration = configuration

diff --git a/Examples/SwiftExampleApp/SwiftExampleApp/Modules/Token/TokenInteractor.swift b/Examples/SwiftExampleApp/SwiftExampleApp/Modules/Token/TokenInteractor.swift
@@ -77,13 +77,6 @@ class TokenInteractor: TokenInteractorInput {
     // MARK: - Helpers
 
     private func handleError(_ error: JPError) {
-
-        if error.code == JudoError.Judo3DSRequestError.rawValue {
-            featureService.handle3DSTransaction(with: error,
-                                                completion: completion)
-            return
-        }
-
         output?.displayErrorAlert(with: error)
     }
 

diff --git a/JudoKit_iOS.xcodeproj/project.pbxproj b/JudoKit_iOS.xcodeproj/project.pbxproj
@@ -2968,8 +2968,8 @@
 		ADB514BC286DF03900332E47 /* ThreeDSecureTwo */ = {
 			isa = PBXGroup;
 			children = (
-				ADB514BD286DF03900332E47 /* JPThreeDSecureTwo.m */,
 				ADB514BE286DF03900332E47 /* JPThreeDSecureTwo.h */,
+				ADB514BD286DF03900332E47 /* JPThreeDSecureTwo.m */,
 			);
 			path = ThreeDSecureTwo;
 			sourceTree = "<group>";

diff --git a/JudoKit_iOSTests/Modules/Transaction/Presenter/JPTransactionPresenterTests.swift b/JudoKit_iOSTests/Modules/Transaction/Presenter/JPTransactionPresenterTests.swift
@@ -197,7 +197,7 @@ class JPTransactionPresenterTests: XCTestCase {
      *
      * WHEN: card model is valid and 3dsError
      *
-     * THEN: should invoke interactor.trasactionSent and dismiss view
+     * THEN: should invoke interactor.trasactionSent
      */
     func test_HandleTransactionButtonTap_WhenUserTapAnThreeDSError_ShouldCallInteractor() {
         interactor.testSendTransaction = .threedDSError