Merge pull request #480 from rudderlabs/release/1.25.3

chore(release): pulling release/1.25.3 into master

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.25.3](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.25.2...v1.25.3) (2024-03-11)
+
+
+### Bug Fixes
+
+* create mutable copy of JSON serialisation object ([#479](https://github.com/rudderlabs/rudder-sdk-ios/issues/479)) ([95704e1](https://github.com/rudderlabs/rudder-sdk-ios/commit/95704e10d4dfc28d854178befe7e073464bf1ac1))
+
 ### [1.25.2](https://github.com/rudderlabs/rudder-sdk-ios/compare/v1.25.1...v1.25.2) (2024-02-20)
 
 

Examples/RudderSampleAppObjC/RudderSampleAppObjC.xcodeproj/project.pbxproj

@@ -24,7 +24,6 @@
 		ED761A062727E28800B086F4 /* CustomFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = ED7619FC2727E28800B086F4 /* CustomFactory.m */; };
 		ED761A072727E28800B086F4 /* _AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = ED7619FD2727E28800B086F4 /* _AppDelegate.m */; };
 		ED8738CE2AB363A80076D24A /* EncryptedDatabaseProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8738CC2AB363A80076D24A /* EncryptedDatabaseProvider.m */; };
-		F6149CC52B32FBC2006995B7 /* RudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = F6149CC42B32FBC2006995B7 /* RudderConfig.plist */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -57,7 +56,6 @@
 		ED7619FD2727E28800B086F4 /* _AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _AppDelegate.m; sourceTree = "<group>"; };
 		ED8738CA2AB363A80076D24A /* EncryptedDatabaseProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncryptedDatabaseProvider.h; sourceTree = "<group>"; };
 		ED8738CC2AB363A80076D24A /* EncryptedDatabaseProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EncryptedDatabaseProvider.m; sourceTree = "<group>"; };
-		F6149CC42B32FBC2006995B7 /* RudderConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RudderConfig.plist; sourceTree = "<group>"; };
 		F928F8A942558010CC7088BF /* Pods-RudderSampleAppObjC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RudderSampleAppObjC.debug.xcconfig"; path = "Target Support Files/Pods-RudderSampleAppObjC/Pods-RudderSampleAppObjC.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -137,7 +135,6 @@
 				ED7619FD2727E28800B086F4 /* _AppDelegate.m */,
 				ED7619F02727E28700B086F4 /* _ViewController.h */,
 				ED7619F92727E28800B086F4 /* _ViewController.m */,
-				F6149CC42B32FBC2006995B7 /* RudderConfig.plist */,
 				ED7619F22727E28700B086F4 /* CustomFactory.h */,
 				ED7619FC2727E28800B086F4 /* CustomFactory.m */,
 				ED7619FB2727E28800B086F4 /* CustomIntegration.h */,
@@ -219,7 +216,6 @@
 			files = (
 				ED761A012727E28800B086F4 /* LaunchScreen.storyboard in Resources */,
 				ED0CA6DE2A7D049E00899C1C /* SampleRudderConfig.plist in Resources */,
-				F6149CC52B32FBC2006995B7 /* RudderConfig.plist in Resources */,
 				ED761A052727E28800B086F4 /* Images.xcassets in Resources */,
 				ED7619FF2727E28800B086F4 /* InfoPlist.strings in Resources */,
 				ED761A022727E28800B086F4 /* Main.storyboard in Resources */,

README.md

@@ -8,7 +8,7 @@
 
 <p align="center">
   <a href="https://cocoapods.org/pods/Rudder">
-    <img src="https://img.shields.io/static/v1?label=pod&message=v1.25.2&color=blue&style=flat">
+    <img src="https://img.shields.io/static/v1?label=pod&message=v1.25.3&color=blue&style=flat">
     </a>
 </p>
 
@@ -39,15 +39,15 @@ The iOS SDK is available through [**CocoaPods**](https://cocoapods.org), [**Cart
 To install the SDK, simply add the following line to your Podfile:
 
 ```xcode
-pod 'Rudder', '1.25.2'
+pod 'Rudder', '1.25.3'
 ```
 
 ### Carthage
 
 For Carthage support, add the following line to your `Cartfile`:
 
 ```xcode
-github "rudderlabs/rudder-sdk-ios" "v1.25.2"
+github "rudderlabs/rudder-sdk-ios" "v1.25.3"
 ```
 
 > Remember to include the following code in all `.m` and `.h` files where you want to refer to or use the RudderStack SDK classes, as shown:
@@ -71,7 +71,7 @@ You can also add the RudderStack iOS SDK via Swift Package Mangaer, via one of t
 
 * Enter the package repository (`[email protected]:rudderlabs/rudder-sdk-ios.git`) in the search bar.
 
-* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.25.2` as the value, as shown:
+* In **Dependency Rule**, select **Up to Next Major Version** and enter `1.25.3` as the value, as shown:
 
 ![Setting dependency](https://user-images.githubusercontent.com/59817155/145574696-8c849749-13e0-40d5-aacb-3fccb5c8e67d.png)
 
@@ -99,7 +99,7 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.25.2")
+        .package(url: "[email protected]:rudderlabs/rudder-sdk-ios.git", from: "1.25.3")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

Sources/Classes/Headers/RSVersion.h

@@ -8,6 +8,6 @@
 #ifndef RSVersion_h
 #define RSVersion_h
 
-NSString *const SDK_VERSION = @"1.25.2";
+NSString *const SDK_VERSION = @"1.25.3";
 
 #endif /* RSVersion_h */

Sources/Classes/RSUtils.m

@@ -189,7 +189,7 @@ + (id _Nullable) deserialize:(NSString*) jsonString {
     @try {
         NSError *error = nil;
         NSData* data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-        id object = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+        id object = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&error];
         if(error) {
             [RSLogger logError:[[NSString alloc] initWithFormat:@"RSUtils: deserialize: Failed to de-serialize the given string back to an object %@", jsonString]];
             return nil;

Tests/ContextTests.swift

@@ -169,6 +169,19 @@ class ContextTests: XCTestCase {
         XCTAssertEqual(context.externalIds, finalExternalIds)
     }
 
+    // This test case verifies the scenario when someone has made an identify call with some externalId and then app is stopped.
+    // At next app launch, externalId is read from the preferenceManager and then RSUtils.deserialize() returns the mutable externalId object.
+    // Now, if someone makes an indentify call with the same userId and externalId-type then externalId must be merged properly without any exception.
+    func test_updateExternalIds_simulatingAppRelaunche() {
+        guard let externalIdString = RSUtils.serialize(externalIds1) else { return XCTAssertThrowsError("externalIdString cannot be null") }
+        preferenceManager.saveExternalIds(externalIdString)
+        context = RSContext(config: RSConfig())
+
+        context.updateExternalIds(externalIds2)
+
+        XCTAssertEqual(context.externalIds, finalExternalIds)
+    }
+
     func test_persistExternalIds() {
         context.updateExternalIds(externalIds1)
         context.persistExternalIds()

package.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.25.2",
+    "version": "1.25.3",
     "description": "Rudder is a platform for collecting, storing and routing customer event data to dozens of tools"
 }

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.qualitygate.wait=false
 sonar.projectKey=rudderlabs_rudder-sdk-ios
 sonar.organization=rudderlabs
 sonar.projectName=RudderStack iOS SDK
-sonar.projectVersion=1.25.2
+sonar.projectVersion=1.25.3
 
 # C/C++/Objective-C related details
 # sonar.cfamily.compile-commands=compile_commands.json