From 44cd078b4b4d2d58ad533e7063937a83b7a623cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 12 Feb 2021 14:12:30 +0100 Subject: [PATCH 1/5] 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 bb45cbcb..c33e271d 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 7.0.0 +MARKETING_VERSION = 7.0.1 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 9.0 diff --git a/Package.swift b/Package.swift index 74aff314..5a8608e0 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "7.0.0" + static let marketingVersion: String = "7.0.1" } let package = Package( From 0b4438839e67e57b9dc91b8448cef58d3f9664d1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Mon, 15 Feb 2021 15:01:34 +0100 Subject: [PATCH 2/5] Update dependencies with TCCore and TCSDK 4.5.4_4.4.1_srg4 --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- Package.resolved | 20 +++++++++---------- Package.swift | 4 ++-- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4fd63311..fe681e11 100644 --- a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -123,8 +123,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git", "state": { "branch": null, - "revision": "be5774e8e68bbf29a9da93506e6bfa6de1177268", - "version": "4.5.4-srg3" + "revision": "491957a21cee60a40d3e5e4912b5f4cf6542ff50", + "version": "4.5.4-srg4" } }, { @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", "state": { "branch": null, - "revision": "391dbdc47db04f4049fdabca6b5d1f5446589d3f", - "version": "4.4.1-srg3" + "revision": "bd6344e97db30e7f5a1cc233716e8dabb8ee6a16", + "version": "4.4.1-srg4" } }, { diff --git a/Package.resolved b/Package.resolved index 2815aeaf..fe681e11 100644 --- a/Package.resolved +++ b/Package.resolved @@ -68,9 +68,9 @@ "package": "SRGDataProvider", "repositoryURL": "https://github.com/SRGSSR/srgdataprovider-apple.git", "state": { - "branch": "develop", - "revision": "fae257b900f89242eff367258ec3e546848a1dee", - "version": null + "branch": null, + "revision": "6556ac22f611b1f4913264ebb20f513165b0f748", + "version": "10.0.0" } }, { @@ -86,9 +86,9 @@ "package": "SRGIdentity", "repositoryURL": "https://github.com/SRGSSR/srgidentity-apple.git", "state": { - "branch": "develop", - "revision": "20fd3c6e0975c97e8df51e817791e210a15784c1", - "version": null + "branch": null, + "revision": "4b5db1151c7f15364665cbfbc28dfce5b60cfceb", + "version": "3.0.3" } }, { @@ -123,8 +123,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git", "state": { "branch": null, - "revision": "be5774e8e68bbf29a9da93506e6bfa6de1177268", - "version": "4.5.4-srg3" + "revision": "491957a21cee60a40d3e5e4912b5f4cf6542ff50", + "version": "4.5.4-srg4" } }, { @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", "state": { "branch": null, - "revision": "391dbdc47db04f4049fdabca6b5d1f5446589d3f", - "version": "4.4.1-srg3" + "revision": "bd6344e97db30e7f5a1cc233716e8dabb8ee6a16", + "version": "4.4.1-srg4" } }, { diff --git a/Package.swift b/Package.swift index 5a8608e0..d6e4c8c3 100644 --- a/Package.swift +++ b/Package.swift @@ -42,8 +42,8 @@ let package = Package( .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.0.3")), .package(name: "SRGLogger", url: "https://github.com/SRGSSR/srglogger-apple.git", .upToNextMinor(from: "3.0.0")), .package(name: "SRGMediaPlayer", url: "https://github.com/SRGSSR/srgmediaplayer-apple.git", .upToNextMinor(from: "6.1.0")), - .package(name: "TCCore", url: "https://github.com/SRGSSR/TCCore-xcframework-apple.git", .exact("4.5.4-srg3")), - .package(name: "TCSDK", url: "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", .exact("4.4.1-srg3")) + .package(name: "TCCore", url: "https://github.com/SRGSSR/TCCore-xcframework-apple.git", .exact("4.5.4-srg4")), + .package(name: "TCSDK", url: "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", .exact("4.4.1-srg4")) ], targets: [ .target( diff --git a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index d6452815..ca684f23 100644 --- a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git", "state": { "branch": null, - "revision": "be5774e8e68bbf29a9da93506e6bfa6de1177268", - "version": "4.5.4-srg3" + "revision": "491957a21cee60a40d3e5e4912b5f4cf6542ff50", + "version": "4.5.4-srg4" } }, { @@ -141,8 +141,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", "state": { "branch": null, - "revision": "391dbdc47db04f4049fdabca6b5d1f5446589d3f", - "version": "4.4.1-srg3" + "revision": "bd6344e97db30e7f5a1cc233716e8dabb8ee6a16", + "version": "4.4.1-srg4" } }, { From f47005eb567b80da7cb795b53f5e8f76a1b77182 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Mon, 22 Feb 2021 19:34:41 +0100 Subject: [PATCH 3/5] Update TC dependencies with a version without AdSupport --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- Package.swift | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index fe681e11..c6d98a55 100644 --- a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -123,8 +123,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git", "state": { "branch": null, - "revision": "491957a21cee60a40d3e5e4912b5f4cf6542ff50", - "version": "4.5.4-srg4" + "revision": "eb686883e63af28174472a09eda97acf07179c88", + "version": "4.5.4-srg5" } }, { @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", "state": { "branch": null, - "revision": "bd6344e97db30e7f5a1cc233716e8dabb8ee6a16", - "version": "4.4.1-srg4" + "revision": "c4becb0b250258b78cb46225af5e269da834db5a", + "version": "4.4.1-srg5" } }, { diff --git a/Package.swift b/Package.swift index d6e4c8c3..8e144087 100644 --- a/Package.swift +++ b/Package.swift @@ -42,8 +42,8 @@ let package = Package( .package(name: "SRGIdentity", url: "https://github.com/SRGSSR/srgidentity-apple.git", .upToNextMinor(from: "3.0.3")), .package(name: "SRGLogger", url: "https://github.com/SRGSSR/srglogger-apple.git", .upToNextMinor(from: "3.0.0")), .package(name: "SRGMediaPlayer", url: "https://github.com/SRGSSR/srgmediaplayer-apple.git", .upToNextMinor(from: "6.1.0")), - .package(name: "TCCore", url: "https://github.com/SRGSSR/TCCore-xcframework-apple.git", .exact("4.5.4-srg4")), - .package(name: "TCSDK", url: "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", .exact("4.4.1-srg4")) + .package(name: "TCCore", url: "https://github.com/SRGSSR/TCCore-xcframework-apple.git", .exact("4.5.4-srg5")), + .package(name: "TCSDK", url: "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", .exact("4.4.1-srg5")) ], targets: [ .target( From f74ff8e998f7fcddea2627c0e5423123ae3e1f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Tue, 23 Feb 2021 08:40:15 +0100 Subject: [PATCH 4/5] Add UT testing that AdSupport.framework is not implicitly linked --- Package.resolved | 8 ++++---- Tests/SRGAnalyticsTests/TrackerTestCase.m | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index fe681e11..c6d98a55 100644 --- a/Package.resolved +++ b/Package.resolved @@ -123,8 +123,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git", "state": { "branch": null, - "revision": "491957a21cee60a40d3e5e4912b5f4cf6542ff50", - "version": "4.5.4-srg4" + "revision": "eb686883e63af28174472a09eda97acf07179c88", + "version": "4.5.4-srg5" } }, { @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", "state": { "branch": null, - "revision": "bd6344e97db30e7f5a1cc233716e8dabb8ee6a16", - "version": "4.4.1-srg4" + "revision": "c4becb0b250258b78cb46225af5e269da834db5a", + "version": "4.4.1-srg5" } }, { diff --git a/Tests/SRGAnalyticsTests/TrackerTestCase.m b/Tests/SRGAnalyticsTests/TrackerTestCase.m index 14d6521b..becdff06 100644 --- a/Tests/SRGAnalyticsTests/TrackerTestCase.m +++ b/Tests/SRGAnalyticsTests/TrackerTestCase.m @@ -22,6 +22,11 @@ - (void)setUp #pragma mark Tests +- (void)testNoHiddenAdSupportFramework +{ + XCTAssertNil(NSClassFromString(@"ASIdentifierManager")); +} + - (void)testCommonLabels { [self expectationForHiddenEventNotificationWithHandler:^BOOL(NSString *event, NSDictionary *labels) { From ed6df19c32e7f68a1a078f28933a083375dc2044 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Tue, 23 Feb 2021 10:30:18 +0100 Subject: [PATCH 5/5] Update dependencies with patch releases --- .../xcshareddata/swiftpm/Package.resolved | 8 ++++---- Package.resolved | 8 ++++---- .../xcshareddata/swiftpm/Package.resolved | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGAnalytics-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved index c6d98a55..192811da 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": "805ef197755a66e634fccb5d23d9068ca5c1f395", - "version": "6.7.0" + "revision": "22e188345550b0870dfa0e98b4fb606f92916cf7", + "version": "6.7.1" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { "branch": null, - "revision": "76a83f3b6219f501b589317f8cc0a11556e0565a", - "version": "3.0.1" + "revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf", + "version": "3.0.2" } }, { diff --git a/Package.resolved b/Package.resolved index c6d98a55..192811da 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/comScore/Comscore-Swift-Package-Manager.git", "state": { "branch": null, - "revision": "805ef197755a66e634fccb5d23d9068ca5c1f395", - "version": "6.7.0" + "revision": "22e188345550b0870dfa0e98b4fb606f92916cf7", + "version": "6.7.1" } }, { @@ -114,8 +114,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { "branch": null, - "revision": "76a83f3b6219f501b589317f8cc0a11556e0565a", - "version": "3.0.1" + "revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf", + "version": "3.0.2" } }, { diff --git a/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Tests/SRGAnalyticsIdentity-tests.xcworkspace/xcshareddata/swiftpm/Package.resolved index ca684f23..a6af74e2 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": "805ef197755a66e634fccb5d23d9068ca5c1f395", - "version": "6.7.0" + "revision": "22e188345550b0870dfa0e98b4fb606f92916cf7", + "version": "6.7.1" } }, { @@ -123,8 +123,8 @@ "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git", "state": { "branch": null, - "revision": "76a83f3b6219f501b589317f8cc0a11556e0565a", - "version": "3.0.1" + "revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf", + "version": "3.0.2" } }, { @@ -132,8 +132,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git", "state": { "branch": null, - "revision": "491957a21cee60a40d3e5e4912b5f4cf6542ff50", - "version": "4.5.4-srg4" + "revision": "eb686883e63af28174472a09eda97acf07179c88", + "version": "4.5.4-srg5" } }, { @@ -141,8 +141,8 @@ "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", "state": { "branch": null, - "revision": "bd6344e97db30e7f5a1cc233716e8dabb8ee6a16", - "version": "4.4.1-srg4" + "revision": "c4becb0b250258b78cb46225af5e269da834db5a", + "version": "4.4.1-srg5" } }, {