From 519df866076c8d981a242c84a1c553a0b2d9ae15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Mon, 1 Jul 2024 07:16:33 +0200 Subject: [PATCH 1/2] Bump version number --- Demo/Demo.xcconfig | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig index b33ecee9..18856460 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 9.1.1 +MARKETING_VERSION = 9.1.2 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index 39c2dc18..cfd2e16f 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "9.1.1" + static let marketingVersion: String = "9.1.2" } let package = Package( From d2d57d1b9b648e59839c34b44119d3faaba73411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20D=C3=A9fago?= Date: Fri, 9 Aug 2024 09:42:13 +0200 Subject: [PATCH 2/2] Wait until the User Agent is retrieved by Commanders Act (#94) --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- Package.swift | 4 ++-- Sources/SRGAnalytics/SRGAnalyticsTracker.m | 1 + .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index 8a3aaeeb..e60df3bb 100644 --- a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/comScore/Comscore-Swift-Package-Manager.git", "state": { "branch": null, - "revision": "fef761279a592960243e67f2aea110c6fa097fd8", - "version": "6.11.0" + "revision": "2d1cd9c0cb52ca76702023b528a059fc0a7d5a4d", + "version": "6.13.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/CommandersAct/iOSV5.git", "state": { "branch": null, - "revision": "1350bca4163cfdd62d1508068601817d86d9f4a5", - "version": "5.4.4" + "revision": "b65eb27cde41d3c40b05520f8713d55a52821553", + "version": "5.4.9" } }, { diff --git a/Package.swift b/Package.swift index cfd2e16f..dc53e37e 100644 --- a/Package.swift +++ b/Package.swift @@ -36,13 +36,13 @@ let package = Package( ) ], dependencies: [ - .package(name: "ComScore", url: "https://github.com/comScore/Comscore-Swift-Package-Manager.git", .upToNextMinor(from: "6.11.0")), + .package(name: "ComScore", url: "https://github.com/comScore/Comscore-Swift-Package-Manager.git", .upToNextMinor(from: "6.13.0")), .package(name: "SRGContentProtection", url: "https://github.com/SRGSSR/srgcontentprotection-apple.git", .upToNextMinor(from: "3.1.0")), .package(name: "SRGDataProvider", url: "https://github.com/SRGSSR/srgdataprovider-apple.git", .upToNextMinor(from: "19.0.0")), .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.3.0")), .package(name: "SRGLogger", url: "https://github.com/SRGSSR/srglogger-apple.git", .upToNextMinor(from: "3.1.0")), .package(name: "SRGMediaPlayer", url: "https://github.com/SRGSSR/srgmediaplayer-apple.git", .upToNextMinor(from: "7.2.0")), - .package(name: "TagCommander", url: "https://github.com/CommandersAct/iOSV5.git", .upToNextMinor(from: "5.4.4")) + .package(name: "TagCommander", url: "https://github.com/CommandersAct/iOSV5.git", .upToNextMinor(from: "5.4.9")) ], targets: [ .target( diff --git a/Sources/SRGAnalytics/SRGAnalyticsTracker.m b/Sources/SRGAnalytics/SRGAnalyticsTracker.m index 957d8b28..f477dc18 100644 --- a/Sources/SRGAnalytics/SRGAnalyticsTracker.m +++ b/Sources/SRGAnalytics/SRGAnalyticsTracker.m @@ -122,6 +122,7 @@ - (void)startCommandersActWithConfiguration:(SRGAnalyticsConfiguration *)configu { self.serverSide = [[ServerSide alloc] initWithSiteID:(int)configuration.site andSourceKey:configuration.sourceKey]; [self.serverSide enableRunningInBackground]; + [self.serverSide waitForUserAgent]; [self.serverSide addPermanentData:@"app_library_version" withValue:SRGAnalyticsMarketingVersion()]; [self.serverSide addPermanentData:@"navigation_app_site_name" withValue:configuration.siteName]; diff --git a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index d5b739f1..cfcc593b 100644 --- a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/comScore/Comscore-Swift-Package-Manager.git", "state": { "branch": null, - "revision": "fef761279a592960243e67f2aea110c6fa097fd8", - "version": "6.11.0" + "revision": "2d1cd9c0cb52ca76702023b528a059fc0a7d5a4d", + "version": "6.13.0" } }, { @@ -24,8 +24,8 @@ "repositoryURL": "https://github.com/CommandersAct/iOSV5.git", "state": { "branch": null, - "revision": "1350bca4163cfdd62d1508068601817d86d9f4a5", - "version": "5.4.4" + "revision": "b65eb27cde41d3c40b05520f8713d55a52821553", + "version": "5.4.9" } }, {