Merge branch 'hotfix/1.9.2'

hipay · Jun 4, 2019 · d179a7b · d179a7b
2 parents 66b7868 + 288f99e
commit d179a7b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 HiPay iOS SDK change log and release notes
 ================================================
 
+1.9.2
+-----
+* SDK : Fix crash in HPFOrderRelatedRequest initialization when using only HiPayFullservice/Core integration
+
 1.9.1
 -----
 * SDK : Fix Source object initialization in order object

diff --git a/Example/HiPayFullservice.xcodeproj/project.pbxproj b/Example/HiPayFullservice.xcodeproj/project.pbxproj
@@ -795,7 +795,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-HiPayFullservice_Tests/Pods-HiPayFullservice_Tests-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-HiPayFullservice_Tests/Pods-HiPayFullservice_Tests-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/HiPayFullservice.common/HPFCoreLocalization.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/HiPayFullservice.common/HPFPaymentScreenViews.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/HiPayFullservice.common/HPFPaymentScreenLocalization.bundle",
@@ -810,7 +810,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HiPayFullservice_Tests/Pods-HiPayFullservice_Tests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HiPayFullservice_Tests/Pods-HiPayFullservice_Tests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		7EBA4B7A3131DF6C9F0D05D8 /* [CP] Check Pods Manifest.lock */ = {
@@ -855,7 +855,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-HiPayFullservice_Example/Pods-HiPayFullservice_Example-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-HiPayFullservice_Example/Pods-HiPayFullservice_Example-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/HiPayFullservice.common-Datecs-POS/HPFCoreLocalization.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/HiPayFullservice.common-Datecs-POS/HPFPaymentScreenViews.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/HiPayFullservice.common-Datecs-POS/HPFPaymentScreenLocalization.bundle",
@@ -872,7 +872,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HiPayFullservice_Example/Pods-HiPayFullservice_Example-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HiPayFullservice_Example/Pods-HiPayFullservice_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,13 +1,13 @@
 PODS:
-  - HiPayFullservice (1.9.1):
-    - HiPayFullservice/Core (= 1.9.1)
-    - HiPayFullservice/Payment-Screen (= 1.9.1)
-  - HiPayFullservice/Core (1.9.1)
-  - HiPayFullservice/Datecs-POS (1.9.1)
-  - HiPayFullservice/Payment-Screen (1.9.1):
+  - HiPayFullservice (1.9.2):
+    - HiPayFullservice/Core (= 1.9.2)
+    - HiPayFullservice/Payment-Screen (= 1.9.2)
+  - HiPayFullservice/Core (1.9.2)
+  - HiPayFullservice/Datecs-POS (1.9.2)
+  - HiPayFullservice/Payment-Screen (1.9.2):
     - HiPayFullservice/Core
     - HiPayFullservice/Utilities
-  - HiPayFullservice/Utilities (1.9.1):
+  - HiPayFullservice/Utilities (1.9.2):
     - HiPayFullservice/Core
   - HockeySDK (5.1.4):
     - HockeySDK/DefaultLib (= 5.1.4)
@@ -45,11 +45,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  HiPayFullservice: 1bd52d0c68e43cc346cede22e4a6bd407dc90315
+  HiPayFullservice: 83898e76171b5ade0bd29062e53b183dcdcc3c32
   HockeySDK: 15afe6bc0a5bfe3a531fd73dbf082095f37dac3b
   OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
   OHHTTPStubs: 9cbce6364bec557cc3439aa6bb7514670d780881
 
 PODFILE CHECKSUM: 41f9dd09b727f046e2a0486037329e98b6a8a870
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.7.1
diff --git a/HiPayFullservice.podspec b/HiPayFullservice.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "HiPayFullservice"
-  s.version          = "1.9.1"
+  s.version          = "1.9.2"
   s.summary          = "HiPay SDK for iOS lets you accept payments in your iOS application."
   s.description      = <<-DESC
                        HiPay is a new generation of payment platform optimized for todays’ e-tailers.

diff --git a/HiPayFullservice/Core/Gateway/Request/Order/HPFOrderRelatedRequest.m b/HiPayFullservice/Core/Gateway/Request/Order/HPFOrderRelatedRequest.m
@@ -38,8 +38,8 @@ - (instancetype)init
 
         NSString * brand_version = [NSString stringWithFormat:@"%ld.%ld.%ld", (long)[[NSProcessInfo processInfo] operatingSystemVersion].majorVersion, (long)[[NSProcessInfo processInfo] operatingSystemVersion].minorVersion, (long)[[NSProcessInfo processInfo] operatingSystemVersion].patchVersion];
 
-        NSBundle *utilitiesBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"HPFUtilitiesResources" ofType:@"bundle"]];
-        NSString *integration_version = [utilitiesBundle objectForInfoDictionaryKey: @"CFBundleShortVersionString"];
+        NSBundle *coreBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"HPFCoreLocalization" ofType:@"bundle"]];
+        NSString *integration_version = [coreBundle objectForInfoDictionaryKey: @"CFBundleShortVersionString"];
 
         self.source = @{
                         @"source" : @"CSDK",