Merge branch 'release/9.0.1'

SRGSSR · Oct 10, 2023 · 5fbe141 · 5fbe141
2 parents 5b42f33 + 5803ffb
commit 5fbe141
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 30 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGAnalytics-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGAnalytics-Package.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/.xcode-version b/.xcode-version
@@ -1 +1 @@
-14.3.1
+15.0
diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 9.0.0
+MARKETING_VERSION = 9.0.1
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 12.0

diff --git a/Demo/SRGAnalytics-demo.xcodeproj/project.pbxproj b/Demo/SRGAnalytics-demo.xcodeproj/project.pbxproj
@@ -234,7 +234,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					E6FC7E871D61F95C00A55085 = {
@@ -359,6 +359,7 @@
 				DYLIB_CURRENT_VERSION = "$(BUILD_NUMBER)";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -419,6 +420,7 @@
 				DYLIB_CURRENT_VERSION = "$(BUILD_NUMBER)";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

diff --git a/Demo/SRGAnalytics-demo.xcodeproj/xcshareddata/xcschemes/SRGAnalytics-demo.xcscheme b/Demo/SRGAnalytics-demo.xcodeproj/xcshareddata/xcschemes/SRGAnalytics-demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

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": "ede1a4aee58fc63a308e2babf3e33f55fedecb68",
-          "version": "6.10.2"
+          "revision": "fef761279a592960243e67f2aea110c6fa097fd8",
+          "version": "6.11.0"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/CommandersAct/iOSV5.git",
         "state": {
           "branch": null,
-          "revision": "2e56e97db76d55657d0dc7d13e2fcd81ce4eaa6c",
-          "version": "5.3.3"
+          "revision": "921c98e57e3044377ee955db5282406e11e6a787",
+          "version": "5.4.1"
         }
       },
       {

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": "ede1a4aee58fc63a308e2babf3e33f55fedecb68",
-          "version": "6.10.2"
+          "revision": "fef761279a592960243e67f2aea110c6fa097fd8",
+          "version": "6.11.0"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/CommandersAct/iOSV5.git",
         "state": {
           "branch": null,
-          "revision": "2e56e97db76d55657d0dc7d13e2fcd81ce4eaa6c",
-          "version": "5.3.3"
+          "revision": "921c98e57e3044377ee955db5282406e11e6a787",
+          "version": "5.4.1"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "9.0.0"
+    static let marketingVersion: String = "9.0.1"
 }
 
 let package = Package(
@@ -36,13 +36,13 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "ComScore", url: "https://github.com/comScore/Comscore-Swift-Package-Manager.git", .upToNextMinor(from: "6.10.0")),
+        .package(name: "ComScore", url: "https://github.com/comScore/Comscore-Swift-Package-Manager.git", .upToNextMinor(from: "6.11.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: "18.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.3.1"))
+        .package(name: "TagCommander", url: "https://github.com/CommandersAct/iOSV5.git", .upToNextMinor(from: "5.4.0"))
     ],
     targets: [
         .target(

diff --git a/Tests/SRGAnalyticsIdentity-tests.xcodeproj/project.pbxproj b/Tests/SRGAnalyticsIdentity-tests.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -164,7 +164,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					08EF593B2221B7B4000E7446 = {
@@ -333,6 +333,7 @@
 				DYLIB_CURRENT_VERSION = "$(BUILD_NUMBER)";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -393,6 +394,7 @@
 				DYLIB_CURRENT_VERSION = "$(BUILD_NUMBER)";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

diff --git a/...lyticsIdentity-tests.xcodeproj/xcshareddata/xcschemes/SRGAnalyticsIdentity-tests.xcscheme b/...lyticsIdentity-tests.xcodeproj/xcshareddata/xcschemes/SRGAnalyticsIdentity-tests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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": "ede1a4aee58fc63a308e2babf3e33f55fedecb68",
-          "version": "6.10.2"
+          "revision": "fef761279a592960243e67f2aea110c6fa097fd8",
+          "version": "6.11.0"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/CommandersAct/iOSV5.git",
         "state": {
           "branch": null,
-          "revision": "b76b700d92c35f02a3d977e7707ecf4df4732b35",
-          "version": "5.3.2"
+          "revision": "921c98e57e3044377ee955db5282406e11e6a787",
+          "version": "5.4.1"
         }
       },
       {

diff --git a/Tests/SRGAnalyticsTests/ConfigurationTestCase.m b/Tests/SRGAnalyticsTests/ConfigurationTestCase.m
@@ -17,50 +17,50 @@ @implementation ConfigurationTestCase
 - (void)testCreation
 {
     SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
-                                                                                                       sourceKey:@"39ae8f94-595c-4ca4-81f7-fb7748bd3f04"
+                                                                                                       sourceKey:@"source-key"
                                                                                                         siteName:@"site-name"];
     XCTAssertTrue(configuration.centralized);
     XCTAssertFalse(configuration.unitTesting);
     XCTAssertEqualObjects(configuration.businessUnitIdentifier, SRGAnalyticsBusinessUnitIdentifierSRF);
     XCTAssertEqual(configuration.site, 3666);
-    XCTAssertEqualObjects(configuration.sourceKey, @"39ae8f94-595c-4ca4-81f7-fb7748bd3f04");
+    XCTAssertEqualObjects(configuration.sourceKey, @"source-key");
     XCTAssertEqualObjects(configuration.siteName, @"site-name");
 }
 
 - (void)testBusinessUnitSpecificConfiguration
 {
     SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
-                                                                                                       sourceKey:@"39ae8f94-595c-4ca4-81f7-fb7748bd3f04"
+                                                                                                       sourceKey:@"source-key"
                                                                                                         siteName:@"site-name"];
     configuration.centralized = NO;
 
     XCTAssertFalse(configuration.centralized);
     XCTAssertFalse(configuration.unitTesting);
     XCTAssertEqualObjects(configuration.businessUnitIdentifier, SRGAnalyticsBusinessUnitIdentifierSRF);
     XCTAssertEqual(configuration.site, 3667);
-    XCTAssertEqualObjects(configuration.sourceKey, @"39ae8f94-595c-4ca4-81f7-fb7748bd3f04");
+    XCTAssertEqualObjects(configuration.sourceKey, @"source-key");
     XCTAssertEqualObjects(configuration.siteName, @"site-name");
 }
 
 - (void)testUnitTestingConfiguration
 {
     SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
-                                                                                                       sourceKey:@"39ae8f94-595c-4ca4-81f7-fb7748bd3f04"
+                                                                                                       sourceKey:@"source-key"
                                                                                                         siteName:@"site-name"];
     configuration.unitTesting = YES;
 
     XCTAssertTrue(configuration.centralized);
     XCTAssertTrue(configuration.unitTesting);
     XCTAssertEqualObjects(configuration.businessUnitIdentifier, SRGAnalyticsBusinessUnitIdentifierSRF);
     XCTAssertEqual(configuration.site, 3666);
-    XCTAssertEqualObjects(configuration.sourceKey, @"39ae8f94-595c-4ca4-81f7-fb7748bd3f04");
+    XCTAssertEqualObjects(configuration.sourceKey, @"source-key");
     XCTAssertEqualObjects(configuration.siteName, @"site-name");
 }
 
 - (void)testCopy
 {
     SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRF
-                                                                                                       sourceKey:@"39ae8f94-595c-4ca4-81f7-fb7748bd3f04"
+                                                                                                       sourceKey:@"source-key"
                                                                                                         siteName:@"site-name"];
     configuration.centralized = YES;
     configuration.unitTesting = YES;