Merge branch 'release/7.0.1'

SRGSSR · Feb 23, 2021 · ce0d076 · ce0d076
2 parents 8d2ccb6 + ed6df19
commit ce0d076
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 34 deletions.
diff --git 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/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,26 +114,26 @@
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "76a83f3b6219f501b589317f8cc0a11556e0565a",
-          "version": "3.0.1"
+          "revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf",
+          "version": "3.0.2"
         }
       },
       {
         "package": "TCCore",
         "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git",
         "state": {
           "branch": null,
-          "revision": "be5774e8e68bbf29a9da93506e6bfa6de1177268",
-          "version": "4.5.4-srg3"
+          "revision": "eb686883e63af28174472a09eda97acf07179c88",
+          "version": "4.5.4-srg5"
         }
       },
       {
         "package": "TCSDK",
         "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git",
         "state": {
           "branch": null,
-          "revision": "391dbdc47db04f4049fdabca6b5d1f5446589d3f",
-          "version": "4.4.1-srg3"
+          "revision": "c4becb0b250258b78cb46225af5e269da834db5a",
+          "version": "4.4.1-srg5"
         }
       },
       {

diff --git 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"
         }
       },
       {
@@ -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"
         }
       },
       {
@@ -114,26 +114,26 @@
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "76a83f3b6219f501b589317f8cc0a11556e0565a",
-          "version": "3.0.1"
+          "revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf",
+          "version": "3.0.2"
         }
       },
       {
         "package": "TCCore",
         "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git",
         "state": {
           "branch": null,
-          "revision": "be5774e8e68bbf29a9da93506e6bfa6de1177268",
-          "version": "4.5.4-srg3"
+          "revision": "eb686883e63af28174472a09eda97acf07179c88",
+          "version": "4.5.4-srg5"
         }
       },
       {
         "package": "TCSDK",
         "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git",
         "state": {
           "branch": null,
-          "revision": "391dbdc47db04f4049fdabca6b5d1f5446589d3f",
-          "version": "4.4.1-srg3"
+          "revision": "c4becb0b250258b78cb46225af5e269da834db5a",
+          "version": "4.4.1-srg5"
         }
       },
       {

diff --git 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(
@@ -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-srg5")),
+        .package(name: "TCSDK", url: "https://github.com/SRGSSR/TCSDK-xcframework-apple.git", .exact("4.4.1-srg5"))
     ],
     targets: [
         .target(

diff --git 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,26 +123,26 @@
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "76a83f3b6219f501b589317f8cc0a11556e0565a",
-          "version": "3.0.1"
+          "revision": "46c78b8cb5738e0286e18f35c586547b1458bdcf",
+          "version": "3.0.2"
         }
       },
       {
         "package": "TCCore",
         "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git",
         "state": {
           "branch": null,
-          "revision": "be5774e8e68bbf29a9da93506e6bfa6de1177268",
-          "version": "4.5.4-srg3"
+          "revision": "eb686883e63af28174472a09eda97acf07179c88",
+          "version": "4.5.4-srg5"
         }
       },
       {
         "package": "TCSDK",
         "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git",
         "state": {
           "branch": null,
-          "revision": "391dbdc47db04f4049fdabca6b5d1f5446589d3f",
-          "version": "4.4.1-srg3"
+          "revision": "c4becb0b250258b78cb46225af5e269da834db5a",
+          "version": "4.4.1-srg5"
         }
       },
       {

diff --git 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) {