Merge pull request #904 from snowplow/release/6.0.7

Release/6.0.7

CHANGELOG

@@ -1,3 +1,7 @@
+Version 6.0.7 (2024-07-16)
+--------------------------
+Fix incorrect decoding of timeout property in network configuration (#902)
+
 Version 6.0.6 (2024-07-10)
 --------------------------
 Fix remote configuration attempting to serialize a logger class after new configuration is fetched (#900)

SnowplowTracker.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "SnowplowTracker"
-    s.version          = "6.0.6"
+    s.version          = "6.0.7"
     s.summary          = "Snowplow event tracker for iOS, macOS, tvOS, watchOS for apps and games."
     s.description      = <<-DESC
     Snowplow is a mobile and event analytics platform with a difference: rather than tell our users how they should analyze their data, we deliver their event-level data in their own data warehouse, on their own Amazon Redshift or Postgres database, so they can analyze it any way they choose. Snowplow mobile is used by data-savvy games companies and app developers to better understand their users and how they engage with their games and applications. Snowplow is open source using the business-friendly Apache License, Version 2.0 and scales horizontally to many billions of events.

Sources/Core/TrackerConstants.swift

@@ -14,7 +14,7 @@
 import Foundation
 
 // --- Version
-let kSPRawVersion = "6.0.6"
+let kSPRawVersion = "6.0.7"
 #if os(iOS)
 let kSPVersion = "ios-\(kSPRawVersion)"
 #elseif os(tvOS)

Sources/Snowplow/Configurations/NetworkConfiguration.swift

@@ -183,6 +183,8 @@ public class NetworkConfiguration: SerializableConfiguration, ConfigurationProto
         _method = HttpMethodOptions(rawValue: coder.decodeInteger(forKey: "method"))
         _customPostPath = coder.decodeObject(forKey: "customPostPath") as? String
         _requestHeaders = coder.decodeObject(forKey: "requestHeaders") as? [String : String]
-        _timeout = coder.decodeObject(forKey: "timeout") as? TimeInterval
+        if coder.containsValue(forKey: "timeout") {
+            _timeout = coder.decodeDouble(forKey: "timeout")
+        }
     }
 }

Tests/Configurations/TestRemoteConfiguration.swift

@@ -98,7 +98,9 @@ class TestRemoteConfiguration: XCTestCase {
 
 #if os(iOS) || os(macOS)
     func testCache() {
-        let bundle = ConfigurationBundle(namespace: "namespace", networkConfiguration: NetworkConfiguration(endpoint: "endpoint"))
+        let networkConfig = NetworkConfiguration(endpoint: "endpoint")
+        networkConfig.timeout = 100
+        let bundle = ConfigurationBundle(namespace: "namespace", networkConfiguration: networkConfig)
         let expected = RemoteConfigurationBundle(schema: "http://iglucentral.com/schemas/com.snowplowanalytics.mobile/remote_config/jsonschema/1-0-0", configurationVersion: 12)
         expected.configurationBundle = [bundle]
 
@@ -119,6 +121,7 @@ class TestRemoteConfiguration: XCTestCase {
         let expectedBundle = expected.configurationBundle[0]
         let configBundle = config?.configurationBundle[0]
         XCTAssertEqual(expectedBundle.networkConfiguration?.endpoint, configBundle?.networkConfiguration?.endpoint)
+        XCTAssertEqual(configBundle?.networkConfiguration?.timeout, 100)
         XCTAssertNil(configBundle?.trackerConfiguration)
     }