Merge pull request #112 from rudderlabs/develop

SKannaniOS · web-flow · commit d99ca6f43cdf · 2025-07-07T13:46:38.000+05:30
chore: pull develop into main
diff --git a/Examples/macOSExample/macOSExample/ContentView.swift b/Examples/macOSExample/macOSExample/ContentView.swift
@@ -169,8 +169,6 @@ struct ContentView: View {
                 
                 CustomButton(title: "Shutdown Analytics") {
                     AnalyticsManager.shared.shutdown()
-                    updateUserInfo()
-                    updateSessionInfo()
                 }
             }
             .padding()
diff --git a/Examples/tvOSExample/tvOSExample/ContentView.swift b/Examples/tvOSExample/tvOSExample/ContentView.swift
@@ -166,8 +166,6 @@ struct ContentView: View {
                         section("System Management:")
                         CustomButton(title: "Shutdown Analytics") {
                             AnalyticsManager.shared.shutdown()
-                            updateUserInfo()
-                            updateSessionInfo()
                         }
                         .focused($focusedButton, equals: .shutdown)
                         
diff --git a/Examples/watchOSExample/watchOSExampleWatchKitApp/ContentView.swift b/Examples/watchOSExample/watchOSExampleWatchKitApp/ContentView.swift
@@ -141,8 +141,6 @@ struct ContentView: View {
                 Section("System Management") {
                     WatchButton(title: "Shutdown Analytics") {
                         AnalyticsManager.shared.shutdown()
-                        updateUserInfo()
-                        updateSessionInfo()
                     }
                 }
             }
diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,12 @@ let package = Package(
         ),
     ],
     targets: [
-        .target(name: "RudderStackAnalytics"),
+        .target(
+            name: "RudderStackAnalytics",
+            resources: [
+                .process("Resources")
+            ]
+        ),
         .testTarget(
             name: "RudderStackAnalyticsTests",
             dependencies: ["RudderStackAnalytics"],
diff --git a/RudderStackAnalytics.xcodeproj/project.pbxproj b/RudderStackAnalytics.xcodeproj/project.pbxproj
@@ -11,6 +11,8 @@
 		532904F02E05BBDE00C8EFE2 /* SwiftExampleApp.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 532904EC2E05BBDE00C8EFE2 /* SwiftExampleApp.xctestplan */; };
 		532904F12E05BBDE00C8EFE2 /* SwiftUIExampleApp.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 532904ED2E05BBDE00C8EFE2 /* SwiftUIExampleApp.xctestplan */; };
 		539E540E2C98CD7D00982E95 /* RudderStackAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5351AA662C6BE95D003C3C47 /* RudderStackAnalytics.framework */; };
+		53AC39722E1533F300B8E16C /* RudderOptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53AC39712E1533F300B8E16C /* RudderOptionTests.swift */; };
+		53AC39B42E16FA6E00B8E16C /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 53AC39B32E16FA6E00B8E16C /* PrivacyInfo.xcprivacy */; };
 		53DEA5E12E03D05A00D6C371 /* KeyValueStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53DEA5D62E03D05A00D6C371 /* KeyValueStore.swift */; };
 		53DEA5E22E03D05A00D6C371 /* ResetUserIdentityAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53DEA5CE2E03D05A00D6C371 /* ResetUserIdentityAction.swift */; };
 		53DEA5E32E03D05A00D6C371 /* NetworkInfoPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53DEA5BE2E03D05A00D6C371 /* NetworkInfoPlugin.swift */; };
@@ -143,6 +145,8 @@
 		532904ED2E05BBDE00C8EFE2 /* SwiftUIExampleApp.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = SwiftUIExampleApp.xctestplan; sourceTree = "<group>"; };
 		5351AA662C6BE95D003C3C47 /* RudderStackAnalytics.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RudderStackAnalytics.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		539E540A2C98CD7D00982E95 /* RudderStackAnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RudderStackAnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		53AC39712E1533F300B8E16C /* RudderOptionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RudderOptionTests.swift; sourceTree = "<group>"; };
+		53AC39B32E16FA6E00B8E16C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		53DEA58F2E03D05A00D6C371 /* Analytics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Analytics.swift; sourceTree = "<group>"; };
 		53DEA5902E03D05A00D6C371 /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
 		53DEA5912E03D05A00D6C371 /* EventManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventManager.swift; sourceTree = "<group>"; };
@@ -293,6 +297,7 @@
 				53DEA5CD2E03D05A00D6C371 /* SessionManagement */,
 				53DEA5D32E03D05A00D6C371 /* StateManagement */,
 				53DEA5DD2E03D05A00D6C371 /* Storage */,
+				53AC39B52E16FA7D00B8E16C /* Resources */,
 			);
 			path = RudderStackAnalytics;
 			sourceTree = "<group>";
@@ -345,6 +350,14 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		53AC39B52E16FA7D00B8E16C /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				53AC39B32E16FA6E00B8E16C /* PrivacyInfo.xcprivacy */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 		53DEA5922E03D05A00D6C371 /* Base */ = {
 			isa = PBXGroup;
 			children = (
@@ -533,6 +546,7 @@
 				53DEA6232E03D06F00D6C371 /* IdentifyEventTests.swift */,
 				53DEA6242E03D06F00D6C371 /* MessageModuleTests.swift */,
 				53DEA6252E03D06F00D6C371 /* ScreenEventTests.swift */,
+				53AC39712E1533F300B8E16C /* RudderOptionTests.swift */,
 				53DEA6262E03D06F00D6C371 /* TrackEventTests.swift */,
 			);
 			path = EventTests;
@@ -752,6 +766,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				53AC39B42E16FA6E00B8E16C /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -889,6 +904,7 @@
 				53DEA6602E03D06F00D6C371 /* ResetUserIdentityActionTests.swift in Sources */,
 				53DEA6612E03D06F00D6C371 /* SessionInfoTests.swift in Sources */,
 				53DEA6622E03D06F00D6C371 /* LifecycleObserverTests.swift in Sources */,
+				53AC39722E1533F300B8E16C /* RudderOptionTests.swift in Sources */,
 				53DEA6632E03D06F00D6C371 /* UserIdTraitsActionTests.swift in Sources */,
 				53DEA6642E03D06F00D6C371 /* LifecycleTrackingPluginTests.swift in Sources */,
 				53DEA6652E03D06F00D6C371 /* DeviceInfoPluginTests.swift in Sources */,
diff --git a/Sources/RudderStackAnalytics/Base/Configuration.swift b/Sources/RudderStackAnalytics/Base/Configuration.swift
@@ -30,7 +30,7 @@ public class Configuration: NSObject {
     var controlPlaneUrl: String
 
     /**
-     A boolean flag to enable GZip compression for network requests. Defaults to `true`.
+     A boolean flag to enable GZip compression for network requests. Defaults to `false`.
      */
     var gzipEnabled: Bool
 
diff --git a/Sources/RudderStackAnalytics/Events/RudderOption.swift b/Sources/RudderStackAnalytics/Events/RudderOption.swift
@@ -38,7 +38,7 @@ public class RudderOption: NSObject {
      The initial integrations are set to the default integrations defined in `Constants.payload.integration`.
      */
     public init(integrations: [String: Any]? = nil, customContext: [String: Any]? = nil, externalIds: [ExternalId]? = nil) {
-        self.integrations = (integrations ?? [:]) + Constants.payload.integration
+        self.integrations = Constants.payload.integration + (integrations ?? [:])
         self.customContext = customContext
         self.externalIds = externalIds
     }
diff --git a/Sources/RudderStackAnalytics/Policies/CountFlushPolicy.swift b/Sources/RudderStackAnalytics/Policies/CountFlushPolicy.swift
@@ -40,11 +40,9 @@ public final class CountFlushPolicy: FlushPolicy {
     /**
      Initializes a new `CountFlushPolicy`.
 
-     - Parameter flushAt: The number of events required to trigger a flush. Defaults to `Constants.flushEventCount.default`.
-     - Note: The flush count is clamped between `Constants.flushEventCount.min` and `Constants.flushEventCount.max`.
-     */
+     - Parameter flushAt: The number of events required to trigger a flush. Defaults to `Constants.flushEventCount.default`.     */
     public init(flushAt: Int = Constants.flushEventCount.default) {
-        self.flushAt = min(Constants.flushEventCount.max, max(flushAt, Constants.flushEventCount.min))
+        self.flushAt = (Constants.flushEventCount.min...Constants.flushEventCount.max).contains(flushAt) ? flushAt : Constants.flushEventCount.default
     }
 
     /**
diff --git a/Sources/RudderStackAnalytics/Policies/FrequencyFlushPolicy.swift b/Sources/RudderStackAnalytics/Policies/FrequencyFlushPolicy.swift
@@ -43,10 +43,9 @@ public final class FrequencyFlushPolicy: FlushPolicy {
      Initializes a new `FrequencyFlushPolicy`.
 
      - Parameter flushIntervalInMillis: The time interval in milliseconds for triggering flushes. Defaults to `Constants.flushInterval.default`.
-     - Note: The interval is clamped to `Constants.flushInterval.min` to prevent excessively short durations.
      */
     public init(flushIntervalInMillis: UInt64 = Constants.flushInterval.default) {
-        self.flushIntervalInMillis = max(flushIntervalInMillis, Constants.flushInterval.min)
+        self.flushIntervalInMillis = flushIntervalInMillis >= Constants.flushInterval.min ? flushIntervalInMillis : Constants.flushInterval.default
     }
 
     /**
diff --git a/Sources/RudderStackAnalytics/Resources/PrivacyInfo.xcprivacy b/Sources/RudderStackAnalytics/Resources/PrivacyInfo.xcprivacy
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>NSPrivacyAccessedAPITypes</key>
+        <array>
+            <dict>
+                <key>NSPrivacyAccessedAPIType</key>
+                <string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+                <key>NSPrivacyAccessedAPITypeReasons</key>
+                <array>
+                    <string>35F9.1</string>
+                </array>
+            </dict>
+            <dict>
+                <key>NSPrivacyAccessedAPIType</key>
+                <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+                <key>NSPrivacyAccessedAPITypeReasons</key>
+                <array>
+                    <string>CA92.1</string>
+                </array>
+            </dict>
+        </array>
+        <key>NSPrivacyCollectedDataTypes</key>
+        <array>
+            <dict>
+                <key>NSPrivacyCollectedDataType</key>
+                <string>NSPrivacyCollectedDataTypeDeviceID</string>
+                <key>NSPrivacyCollectedDataTypeLinked</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypeTracking</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypePurposes</key>
+                <array>
+                    <string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
+                </array>
+            </dict>
+            <dict>
+                <key>NSPrivacyCollectedDataType</key>
+                <string>App Name</string>
+                <key>NSPrivacyCollectedDataTypeLinked</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypeTracking</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypePurposes</key>
+                <array>
+                    <string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
+                </array>
+            </dict>
+            <dict>
+                <key>NSPrivacyCollectedDataType</key>
+                <string>App Version</string>
+                <key>NSPrivacyCollectedDataTypeLinked</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypeTracking</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypePurposes</key>
+                <array>
+                    <string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
+                </array>
+            </dict>
+            <dict>
+                <key>NSPrivacyCollectedDataType</key>
+                <string>NSPrivacyCollectedDataTypeProductInteraction</string>
+                <key>NSPrivacyCollectedDataTypeLinked</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypeTracking</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypePurposes</key>
+                <array>
+                    <string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
+                </array>
+            </dict>
+            <dict>
+                <key>NSPrivacyCollectedDataType</key>
+                <string>NSPrivacyCollectedDataTypeOtherDataTypes</string>
+                <key>NSPrivacyCollectedDataTypeLinked</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypeTracking</key>
+                <false/>
+                <key>NSPrivacyCollectedDataTypePurposes</key>
+                <array>
+                    <string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
+                </array>
+            </dict>
+        </array>
+    </dict>
+</plist>
diff --git a/Tests/RudderStackAnalyticsTests/EventTests/RudderOptionTests.swift b/Tests/RudderStackAnalyticsTests/EventTests/RudderOptionTests.swift
diff --git a/Tests/RudderStackAnalyticsTests/FlushPolicyModuleTests.swift b/Tests/RudderStackAnalyticsTests/FlushPolicyModuleTests.swift

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,6 @@ struct ContentView: View {`
`169`	`169`
`170`	`170`	`CustomButton(title: "Shutdown Analytics") {`
`171`	`171`	`AnalyticsManager.shared.shutdown()`
`172`		`- updateUserInfo()`
`173`		`- updateSessionInfo()`
`174`	`172`	`}`
`175`	`173`	`}`
`176`	`174`	`.padding()`
Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,6 @@ struct ContentView: View {`
`166`	`166`	`section("System Management:")`
`167`	`167`	`CustomButton(title: "Shutdown Analytics") {`
`168`	`168`	`AnalyticsManager.shared.shutdown()`
`169`		`- updateUserInfo()`
`170`		`- updateSessionInfo()`
`171`	`169`	`}`
`172`	`170`	`.focused($focusedButton, equals: .shutdown)`
`173`	`171`
Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,6 @@ struct ContentView: View {`
`141`	`141`	`Section("System Management") {`
`142`	`142`	`WatchButton(title: "Shutdown Analytics") {`
`143`	`143`	`AnalyticsManager.shared.shutdown()`
`144`		`- updateUserInfo()`
`145`		`- updateSessionInfo()`
`146`	`144`	`}`
`147`	`145`	`}`
`148`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class RudderOption: NSObject {`
`38`	`38`	The initial integrations are set to the default integrations defined in `Constants.payload.integration`.
`39`	`39`	`*/`
`40`	`40`	`public init(integrations: [String: Any]? = nil, customContext: [String: Any]? = nil, externalIds: [ExternalId]? = nil) {`
`41`		`- self.integrations = (integrations ?? [:]) + Constants.payload.integration`
	`41`	`+ self.integrations = Constants.payload.integration + (integrations ?? [:])`
`42`	`42`	`self.customContext = customContext`
`43`	`43`	`self.externalIds = externalIds`
`44`	`44`	`}`