Fix build

cloudpayments · Aug 10, 2023 · 61125e9 · 61125e9
1 parent d40b257
commit 61125e9
Show file tree

Hide file tree

Showing 31 changed files with 161 additions and 126 deletions.
diff --git a/Cloudpayments-SDK-iOS.podspec b/Cloudpayments-SDK-iOS.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "Cloudpayments"
-  spec.version      = "1.2.15"
+  spec.version      = "1.3.0"
   spec.summary      = "Core library that allows you to use internet acquiring from CloudPayments in your app"
   spec.description  = "Core library that allows you to use internet acquiring from CloudPayments in your app!"
 
@@ -31,7 +31,7 @@ Pod::Spec.new do |spec|
 
   spec.dependency 'CloudpaymentsNetworking'  
   spec.dependency 'YandexLoginSDK'
-  spec.dependency 'YandexPaySDK/Dynamic', '1.3.9'
+  spec.dependency 'YandexPaySDK/Dynamic', '~>1.3.9'
 
   spec.swift_version = '5.0'
 

diff --git a/demo/Podfile.lock b/demo/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - Cloudpayments (1.2.15):
     - CloudpaymentsNetworking
     - YandexLoginSDK
-    - YandexPaySDK/Dynamic (= 1.3.9)
+    - YandexPaySDK/Dynamic (~> 1.3.9)
   - CloudpaymentsNetworking (1.0.1)
   - PromiseKit/CorePromise (6.18.1)
   - YandexLoginSDK (2.1.1)
@@ -35,7 +35,7 @@ EXTERNAL SOURCES:
     :path: "../networking"
 
 SPEC CHECKSUMS:
-  Cloudpayments: a6a557e4e22bb56bdc015678f6a9d4f2b0c48024
+  Cloudpayments: 67362920ec5888a642d45033504fdc924f06aabe
   CloudpaymentsNetworking: b03a482d4200209a46f27da663d235228bab5071
   PromiseKit: 49d70c53d5d20e346beaea4b276b5dd2ab446bb4
   YandexLoginSDK: ad9a07aca36a7748353af17c9cbbf2b83be9ba26
@@ -44,4 +44,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 5e8a634e0cd7a67253d7408cf5c57f7d427f3aaf
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.1
diff --git a/demo/demo.xcodeproj/project.pbxproj b/demo/demo.xcodeproj/project.pbxproj
@@ -15,8 +15,8 @@
 		13B49EC5224A4793001F85CF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 13B49EC3224A4793001F85CF /* Main.storyboard */; };
 		13B49EC7224A4795001F85CF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B49EC6224A4795001F85CF /* Assets.xcassets */; };
 		13B49ECA224A4795001F85CF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 13B49EC8224A4795001F85CF /* LaunchScreen.storyboard */; };
+		6F5FB7615BC8B5E39D7A2504 /* Pods_demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22F1402171DC0547C76492C2 /* Pods_demo.framework */; };
 		831A1D222538413A003CA251 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 831A1D212538413A003CA251 /* BaseViewController.swift */; };
-		85BB5F2A471E3E0244FD8E15 /* Pods_demo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4380A3AAB1379805D4B0CFD2 /* Pods_demo.framework */; };
 		E86315D12A4B24E80041F778 /* LogoHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E86315D02A4B24E80041F778 /* LogoHeaderView.xib */; };
 		E86315D42A4B29E10041F778 /* FooterActionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E86315D32A4B29E10041F778 /* FooterActionView.xib */; };
 		E86315D62A4B29F00041F778 /* FooterActionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E86315D52A4B29F00041F778 /* FooterActionView.swift */; };
@@ -38,11 +38,11 @@
 		13B49EC6224A4795001F85CF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		13B49EC9224A4795001F85CF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		13B49ECB224A4795001F85CF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		23866851E972719EBA73AAB3 /* Pods-demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.debug.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.debug.xcconfig"; sourceTree = "<group>"; };
-		4380A3AAB1379805D4B0CFD2 /* Pods_demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7C85608EA0091E426EA42B4B /* Pods-demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.release.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.release.xcconfig"; sourceTree = "<group>"; };
+		22F1402171DC0547C76492C2 /* Pods_demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		831A1D212538413A003CA251 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
 		8387197B2519F06C00797EDA /* demo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = demo.entitlements; sourceTree = "<group>"; };
+		9F0BD64C6137225158C9CF44 /* Pods-demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.release.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.release.xcconfig"; sourceTree = "<group>"; };
+		BD38D7D9DD1E931DC97F9E4A /* Pods-demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-demo.debug.xcconfig"; path = "Target Support Files/Pods-demo/Pods-demo.debug.xcconfig"; sourceTree = "<group>"; };
 		E86315D02A4B24E80041F778 /* LogoHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LogoHeaderView.xib; sourceTree = "<group>"; };
 		E86315D32A4B29E10041F778 /* FooterActionView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FooterActionView.xib; sourceTree = "<group>"; };
 		E86315D52A4B29F00041F778 /* FooterActionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FooterActionView.swift; sourceTree = "<group>"; };
@@ -57,7 +57,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				85BB5F2A471E3E0244FD8E15 /* Pods_demo.framework in Frameworks */,
+				6F5FB7615BC8B5E39D7A2504 /* Pods_demo.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -95,7 +95,7 @@
 			children = (
 				13B49EBE224A4793001F85CF /* demo */,
 				783360454E6067683DC51BAD /* Pods */,
-				5F3537734DD365BBCA4E64C3 /* Frameworks */,
+				4024C9614BEFBA2EFD50A144 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -118,19 +118,19 @@
 			path = demo;
 			sourceTree = "<group>";
 		};
-		5F3537734DD365BBCA4E64C3 /* Frameworks */ = {
+		4024C9614BEFBA2EFD50A144 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				4380A3AAB1379805D4B0CFD2 /* Pods_demo.framework */,
+				22F1402171DC0547C76492C2 /* Pods_demo.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
 		783360454E6067683DC51BAD /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				23866851E972719EBA73AAB3 /* Pods-demo.debug.xcconfig */,
-				7C85608EA0091E426EA42B4B /* Pods-demo.release.xcconfig */,
+				BD38D7D9DD1E931DC97F9E4A /* Pods-demo.debug.xcconfig */,
+				9F0BD64C6137225158C9CF44 /* Pods-demo.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -261,11 +261,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B49ECE224A4795001F85CF /* Build configuration list for PBXNativeTarget "demo" */;
 			buildPhases = (
-				CCD4982E45E26F87DACB073F /* [CP] Check Pods Manifest.lock */,
+				3FD49B0BD17CEF8C29CCD12E /* [CP] Check Pods Manifest.lock */,
 				13B49EB8224A4793001F85CF /* Sources */,
 				13B49EB9224A4793001F85CF /* Frameworks */,
 				13B49EBA224A4793001F85CF /* Resources */,
-				95AC84067DFAA22CBBF3E62F /* [CP] Embed Pods Frameworks */,
+				8658D5B5966800CD83F8E0B6 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -325,43 +325,43 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		95AC84067DFAA22CBBF3E62F /* [CP] Embed Pods Frameworks */ = {
+		3FD49B0BD17CEF8C29CCD12E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-demo-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks.sh\"\n";
+			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";
 			showEnvVarsInLog = 0;
 		};
-		CCD4982E45E26F87DACB073F /* [CP] Check Pods Manifest.lock */ = {
+		8658D5B5966800CD83F8E0B6 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-demo-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-demo/Pods-demo-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -527,7 +527,7 @@
 		};
 		13B49ECF224A4795001F85CF /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 23866851E972719EBA73AAB3 /* Pods-demo.debug.xcconfig */;
+			baseConfigurationReference = BD38D7D9DD1E931DC97F9E4A /* Pods-demo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = demo/demo.entitlements;
@@ -559,7 +559,7 @@
 		};
 		13B49ED0224A4795001F85CF /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7C85608EA0091E426EA42B4B /* Pods-demo.release.xcconfig */;
+			baseConfigurationReference = 9F0BD64C6137225158C9CF44 /* Pods-demo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = demo/demo.entitlements;

diff --git a/demo/demo/Sources/DemoModule/Controllers/DemoViewController.swift b/demo/demo/Sources/DemoModule/Controllers/DemoViewController.swift
@@ -116,10 +116,10 @@ class DemoViewController: BaseViewController {
             delegate: self,
             uiDelegate: self,
             scanner: nil,
-            requireEmail: false,
+            requireEmail: true,
             useDualMessagePayment: footer.demoActionSwitch.isOn,
-            disableApplePay: true,
-            disableYandexPay: true,
+            disableApplePay: false,
+            disableYandexPay: false,
             apiUrl: apiUrl,
             changedEmail: nil
         )

diff --git a/networking/source/CloudpaymentsRequestType.swift b/networking/source/CloudpaymentsRequestType.swift
@@ -13,16 +13,16 @@ public protocol CloudpaymentsRequestType {
 public extension CloudpaymentsRequestType {
 
 
-    func resultDataPrint<T:Decodable>(type: T.Type, _ value: Data) {
-        print("\n\n")
-        print(#file, "\n", #line, #function)
-        print("-----------------------", type.self, "-----------------------")
-        if let string = String(data: value, encoding: .utf8) {
-            print("\n", string, "\n")
-        }
-        print("-----------------------", "end", "-----------------------")
-        print("\n\n")
-    }
+//    func resultDataPrint<T:Decodable>(type: T.Type, _ value: Data) {
+//        print("\n\n")
+//        print(#file, "\n", #line, #function)
+//        print("-----------------------", type.self, "-----------------------")
+//        if let string = String(data: value, encoding: .utf8) {
+//            print("\n", string, "\n")
+//        }
+//        print("-----------------------", "end", "-----------------------")
+//        print("\n\n")
+//    }
 
 
     func execute(dispatcher: CloudpaymentsNetworkDispatcher = CloudpaymentsURLSessionNetworkDispatcher.instance,

diff --git a/sdk/Cloudpayments.podspec b/sdk/Cloudpayments.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "Cloudpayments"
-  spec.version      = "1.2.15"
+  spec.version      = "1.3.0"
   spec.summary      = "Core library that allows you to use internet acquiring from CloudPayments in your app"
   spec.description  = "Core library that allows you to use internet acquiring from CloudPayments in your app!"
 
@@ -31,7 +31,7 @@ Pod::Spec.new do |spec|
 
   spec.dependency 'CloudpaymentsNetworking'  
   spec.dependency 'YandexLoginSDK'
-  spec.dependency 'YandexPaySDK/Dynamic', '1.3.9'
+  spec.dependency 'YandexPaySDK/Dynamic', '~>1.3.9'
 
   spec.swift_version = '5.0'
 

diff --git a/sdk/Podfile.lock b/sdk/Podfile.lock
@@ -37,4 +37,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 8c6518e79e904187361d0ab53df4ca09d3fc1395
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.1
diff --git a/sdk/Pods/Manifest.lock b/sdk/Pods/Manifest.lock
diff --git a/sdk/Pods/Pods.xcodeproj/project.pbxproj b/sdk/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/sdk/Pods/Target Support Files/CloudpaymentsNetworking/CloudpaymentsNetworking-Info.plist b/sdk/Pods/Target Support Files/CloudpaymentsNetworking/CloudpaymentsNetworking-Info.plist
diff --git a/sdk/Pods/Target Support Files/CloudpaymentsNetworking/CloudpaymentsNetworking.debug.xcconfig b/sdk/Pods/Target Support Files/CloudpaymentsNetworking/CloudpaymentsNetworking.debug.xcconfig
diff --git a/...ods/Target Support Files/CloudpaymentsNetworking/CloudpaymentsNetworking.release.xcconfig b/...ods/Target Support Files/CloudpaymentsNetworking/CloudpaymentsNetworking.release.xcconfig
diff --git a/sdk/Pods/Target Support Files/Pods-sdk/Pods-sdk-Info.plist b/sdk/Pods/Target Support Files/Pods-sdk/Pods-sdk-Info.plist
diff --git a/sdk/Pods/Target Support Files/PromiseKit/PromiseKit-Info.plist b/sdk/Pods/Target Support Files/PromiseKit/PromiseKit-Info.plist
diff --git a/sdk/Pods/Target Support Files/PromiseKit/PromiseKit.debug.xcconfig b/sdk/Pods/Target Support Files/PromiseKit/PromiseKit.debug.xcconfig
diff --git a/sdk/Pods/Target Support Files/PromiseKit/PromiseKit.release.xcconfig b/sdk/Pods/Target Support Files/PromiseKit/PromiseKit.release.xcconfig
diff --git a/sdk/Pods/Target Support Files/YandexLoginSDK/YandexLoginSDK-Info.plist b/sdk/Pods/Target Support Files/YandexLoginSDK/YandexLoginSDK-Info.plist
diff --git a/sdk/Pods/Target Support Files/YandexLoginSDK/YandexLoginSDK.debug.xcconfig b/sdk/Pods/Target Support Files/YandexLoginSDK/YandexLoginSDK.debug.xcconfig
diff --git a/sdk/Pods/Target Support Files/YandexLoginSDK/YandexLoginSDK.release.xcconfig b/sdk/Pods/Target Support Files/YandexLoginSDK/YandexLoginSDK.release.xcconfig