Merge branch 'release/9.2.1'

SRGSSR · Oct 12, 2023 · 6fd6310 · 6fd6310
2 parents a4b3c53 + ee87f1c
commit 6fd6310
Show file tree

Hide file tree

Showing 57 changed files with 371 additions and 218 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGLetterbox.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGLetterbox.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/Info.plist b/Demo/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>AVInitialRouteSharingPolicy</key>
+	<string>LongFormVideo</string>
 	<key>AppCenterSecret</key>
 	<string>$(APPCENTER_SECRET)</string>
 	<key>AppCenterURL</key>
@@ -53,6 +55,23 @@
 	</dict>
 	<key>PlayMMFServiceURL</key>
 	<string>$(PLAY_MMF_SERVICE_URL)</string>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<true/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneConfigurationName</key>
+					<string>Default</string>
+					<key>UISceneDelegateClassName</key>
+					<string>SceneDelegate</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>
@@ -78,26 +97,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>AVInitialRouteSharingPolicy</key>
-	<string>LongFormVideo</string>
 	<key>UIUserInterfaceStyle</key>
 	<string>Automatic</string>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<true/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneConfigurationName</key>
-					<string>Default</string>
-					<key>UISceneDelegateClassName</key>
-					<string>SceneDelegate</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
 </dict>
 </plist>
diff --git a/Demo/SRGLetterbox-demo.xcodeproj/project.pbxproj b/Demo/SRGLetterbox-demo.xcodeproj/project.pbxproj
@@ -362,9 +362,9 @@
 			buildConfigurationList = 6FAB3B4E1E28FE2000CC2197 /* Build configuration list for PBXNativeTarget "SRGLetterbox-demo" */;
 			buildPhases = (
 				084F2EE323664ABC00A983FF /* Restore original icons if needed */,
+				084F2EE423664AE900A983FF /* Make custom icons */,
 				6FAB3B361E28FE2000CC2197 /* Sources */,
 				6FAB3B371E28FE2000CC2197 /* Frameworks */,
-				084F2EE423664AE900A983FF /* Make custom icons */,
 				6FAB3B381E28FE2000CC2197 /* Resources */,
 				084F2EE523664B8400A983FF /* Restore original icons */,
 				6F261DC325190789008EF524 /* Extract Signing Identity */,
@@ -391,7 +391,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6FAB3B391E28FE2000CC2197 = {
@@ -628,6 +628,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";
@@ -708,6 +709,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "NIGHTLY=1";
@@ -788,6 +790,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "NIGHTLY=1";
@@ -913,6 +916,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -974,6 +978,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = "RELEASE=1";

diff --git a/Demo/SRGLetterbox-demo.xcodeproj/xcshareddata/xcschemes/SRGLetterbox-demo.xcscheme b/Demo/SRGLetterbox-demo.xcodeproj/xcshareddata/xcschemes/SRGLetterbox-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/SRGLetterbox-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGLetterbox-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -28,6 +28,15 @@
           "version": "1.3.2-srg6"
         }
       },
+      {
+        "package": "TagCommander SDK V5",
+        "repositoryURL": "https://github.com/CommandersAct/iOSV5.git",
+        "state": {
+          "branch": null,
+          "revision": "2e56e97db76d55657d0dc7d13e2fcd81ce4eaa6c",
+          "version": "5.3.3"
+        }
+      },
       {
         "package": "libextobjc",
         "repositoryURL": "https://github.com/SRGSSR/libextobjc.git",
@@ -78,8 +87,8 @@
         "repositoryURL": "https://github.com/SRGSSR/srganalytics-apple.git",
         "state": {
           "branch": null,
-          "revision": "c92014ca8838ad3cf403735ce25757afb04cd31f",
-          "version": "8.2.0"
+          "revision": "5b42f334290ee3268f61b62d02e509ec74f4a721",
+          "version": "9.0.0"
         }
       },
       {
@@ -154,24 +163,6 @@
           "version": "3.1.0"
         }
       },
-      {
-        "package": "TCCore",
-        "repositoryURL": "https://github.com/SRGSSR/TCCore-xcframework-apple.git",
-        "state": {
-          "branch": null,
-          "revision": "eb686883e63af28174472a09eda97acf07179c88",
-          "version": "4.5.4-srg5"
-        }
-      },
-      {
-        "package": "TCSDK",
-        "repositoryURL": "https://github.com/SRGSSR/TCSDK-xcframework-apple.git",
-        "state": {
-          "branch": null,
-          "revision": "c4becb0b250258b78cb46225af5e269da834db5a",
-          "version": "4.4.1-srg5"
-        }
-      },
       {
         "package": "UICKeyChainStore",
         "repositoryURL": "https://github.com/kishikawakatsumi/UICKeyChainStore.git",

diff --git a/Demo/Sources/Application/AppDelegate.m b/Demo/Sources/Application/AppDelegate.m
@@ -45,13 +45,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     SRGLetterboxService.sharedService.mirroredOnExternalScreen = ApplicationSettingIsMirroredOnExternalScreen();
 #endif
 
-    // Use test setup and pre-production mode since there will never be any public App Store version of this demo application.
-    // This prevents tvOS builds delivered with TestFlight from sending production data.
-    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierRTS
-                                                                                                       container:10
-                                                                                                        siteName:@"rts-app-test-v"];
+    // Use a debug source key since there will never be any public App Store version of this demo application.
+    SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierSRG
+                                                                                                       sourceKey:@"39ae8f94-595c-4ca4-81f7-fb7748bd3f04"
+                                                                                                        siteName:@"srg-app-letterbox-apple"];
     configuration.centralized = YES;
-    configuration.environmentMode = SRGAnalyticsEnvironmentModePreProduction;
 
     [[SRGAnalyticsTracker sharedTracker] startWithConfiguration:configuration];
 

diff --git a/Demo/Sources/Demos/AdvancedPlayerViewController.h b/Demo/Sources/Demos/AdvancedPlayerViewController.h
@@ -11,7 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 API_UNAVAILABLE(tvos)
-@interface AdvancedPlayerViewController : UIViewController <SRGLetterboxPictureInPictureDelegate, SRGLetterboxViewDelegate, UIGestureRecognizerDelegate, UIViewControllerTransitioningDelegate>
+@interface AdvancedPlayerViewController : UIViewController <SRGAnalyticsViewTracking, SRGLetterboxPictureInPictureDelegate, SRGLetterboxViewDelegate, UIGestureRecognizerDelegate, UIViewControllerTransitioningDelegate>
 
 // If `media` is set, `URN` is ignored.
 - (instancetype)initWithURN:(nullable NSString *)URN media:(nullable SRGMedia *)media serviceURL:(nullable NSURL *)serviceURL;

diff --git a/Demo/Sources/Demos/AdvancedPlayerViewController~ios.m b/Demo/Sources/Demos/AdvancedPlayerViewController~ios.m
@@ -290,6 +290,18 @@ - (void)reloadDataOverriddenWithMedia:(SRGMedia *)media
     self.URNLabel.text = media.URN;
 }
 
+#pragma mark SRGAnalyticsViewTracking protocol
+
+- (NSString *)srg_pageViewTitle
+{
+    return @"Advanced Player";
+}
+
+- (NSString *)srg_pageViewType
+{
+    return @"Detail";
+}
+
 #pragma mark SRGLetterboxPictureInPictureDelegate protocol
 
 - (BOOL)letterboxDismissUserInterfaceForPictureInPicture
@@ -314,12 +326,12 @@ - (void)letterboxRestoreUserInterfaceForPictureInPictureWithCompletionHandler:(v
 
 - (void)letterboxDidStartPictureInPicture
 {
-    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@"pip_start"];
+    [[SRGAnalyticsTracker sharedTracker] trackEventWithName:@"pip_start"];
 }
 
 - (void)letterboxDidEndPictureInPicture
 {
-    [[SRGAnalyticsTracker sharedTracker] trackHiddenEventWithName:@"pip_end"];
+    [[SRGAnalyticsTracker sharedTracker] trackEventWithName:@"pip_end"];
 }
 
 - (void)letterboxDidStopPlaybackFromPictureInPicture

diff --git a/Demo/Sources/Demos/FeedsViewController.h b/Demo/Sources/Demos/FeedsViewController.h
@@ -4,6 +4,7 @@
 //  License information is available from the LICENSE file.
 //
 
+@import SRGAnalytics;
 @import UIKit;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -27,7 +28,7 @@ typedef API_UNAVAILABLE(tvos) NS_ENUM(NSInteger, Feed) {
 };
 
 API_UNAVAILABLE(tvos)
-@interface FeedsViewController : UIViewController <UITableViewDataSource, UITableViewDelegate>
+@interface FeedsViewController : UIViewController <SRGAnalyticsViewTracking, UITableViewDataSource, UITableViewDelegate>
 
 @property (nonatomic) Feed feed;
 

diff --git a/Demo/Sources/Demos/FeedsViewController~ios.m b/Demo/Sources/Demos/FeedsViewController~ios.m
@@ -152,6 +152,18 @@ - (void)updateAudioSession
     }
 }
 
+#pragma mark SRGAnalyticsViewTracking protocol
+
+- (NSString *)srg_pageViewTitle
+{
+    return @"Feeds";
+}
+
+- (NSString *)srg_pageViewType
+{
+    return @"Detail";
+}
+
 #pragma mark UITableViewDataSource protocol
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section

diff --git a/Demo/Sources/Demos/ListsViewController.h b/Demo/Sources/Demos/ListsViewController.h
@@ -4,11 +4,12 @@
 //  License information is available from the LICENSE file.
 //
 
+@import SRGAnalytics;
 @import UIKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ListsViewController : UITableViewController
+@interface ListsViewController : UITableViewController <SRGAnalyticsViewTracking>
 
 @end
 

diff --git a/Demo/Sources/Demos/ListsViewController.m b/Demo/Sources/Demos/ListsViewController.m
@@ -36,6 +36,18 @@ - (void)viewDidLoad
 #endif
 }
 
+#pragma mark SRGAnalyticsViewTracking protocol
+
+- (NSString *)srg_pageViewTitle
+{
+    return @"Lists";
+}
+
+- (NSString *)srg_pageViewType
+{
+    return @"LandingPage";
+}
+
 #pragma mark UITableViewDataSource protocol
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView

diff --git a/Demo/Sources/Demos/MediaListViewController.h b/Demo/Sources/Demos/MediaListViewController.h
@@ -4,6 +4,7 @@
 //  License information is available from the LICENSE file.
 //
 
+@import SRGAnalytics;
 @import SRGDataProviderModel;
 @import UIKit;
 
@@ -175,7 +176,7 @@ typedef NS_ENUM(NSInteger, MediaList) {
     MediaListLiveWebRTR
 };
 
-@interface MediaListViewController : UITableViewController
+@interface MediaListViewController : UITableViewController <SRGAnalyticsViewTracking>
 
 - (instancetype)initWithMediaList:(MediaList)mediaList topic:(nullable SRGTopic *)topic serviceURL:(nullable NSURL *)serviceURL;
 

diff --git a/Demo/Sources/Demos/MediaListViewController.m b/Demo/Sources/Demos/MediaListViewController.m
@@ -348,6 +348,18 @@ - (void)refresh
     self.request = request;
 }
 
+#pragma mark SRGAnalyticsViewTracking protocol
+
+- (NSString *)srg_pageViewTitle
+{
+    return @"Media List";
+}
+
+- (NSString *)srg_pageViewType
+{
+    return @"Overview";
+}
+
 #pragma mark UITableViewDataSource protocol
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section

diff --git a/Demo/Sources/Demos/MediasViewController.h b/Demo/Sources/Demos/MediasViewController.h
@@ -4,11 +4,12 @@
 //  License information is available from the LICENSE file.
 //
 
+@import SRGAnalytics;
 @import UIKit;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface MediasViewController : UITableViewController
+@interface MediasViewController : UITableViewController <SRGAnalyticsViewTracking>
 
 @end
 

diff --git a/Demo/Sources/Demos/MediasViewController.m b/Demo/Sources/Demos/MediasViewController.m
@@ -62,6 +62,18 @@ - (void)openCustomURNEntryAlertWithCompletionBlock:(void (^)(NSString * _Nullabl
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
+#pragma mark SRGAnalyticsViewTracking protocol
+
+- (NSString *)srg_pageViewTitle
+{
+    return @"Medias";
+}
+
+- (NSString *)srg_pageViewType
+{
+    return @"LandingPage";
+}
+
 #pragma mark UITableViewDataSource protocol
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView