Merge branch 'release/3.0.4'

.gitignore

@@ -8,7 +8,7 @@ xcuserdata/
 *.xcscmblueprint
 xcuserdata
 
-/fastlane/*.xcresult
+/fastlane/xcresult
 /fastlane/*.xml
 
 /vendor

.rubocop.yml

@@ -0,0 +1,35 @@
+inherit_mode:
+  merge:
+    - Include
+
+AllCops:
+  Exclude:
+    - 'Carthage/**/*'
+    - 'Demo/Carthage/**/*'
+    - 'vendor/**/*'
+  Include:
+    - 'fastlane/Pluginfile'
+
+# this would cause errors with long lanes
+Metrics/BlockLength:
+  Enabled: true
+  ExcludedMethods: ['platform', 'for_platform']
+
+# Lane description and gem lines can be long
+Layout/LineLength:
+  Enabled: true
+  Max: 100
+  IgnoredPatterns: ['^gem', '^(\s+|)desc', '^(\s+|)UI.']
+
+# They have not to be snake_case
+Naming/FileName:
+  Exclude:
+    - '**/Appfile'
+    - '**/Gemfile'
+    - '**/Pluginfile'
+    - '**/Fastfile'
+
+# Variables have to be as described in fastlane documentation
+Style/RedundantInterpolation:
+  Exclude:
+    - '**/Appfile'

.swiftpm/xcode/xcshareddata/xcschemes/SRGContentProtection.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/Demo.xcconfig

@@ -1,5 +1,5 @@
 // Version information
-MARKETING_VERSION = 3.0.3
+MARKETING_VERSION = 3.0.4
 
 // Deployment targets
 IPHONEOS_DEPLOYMENT_TARGET = 9.0

Demo/Info.plist

@@ -48,5 +48,22 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<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>

Demo/Resources/MediaDemoConfiguration.plist

@@ -8,7 +8,7 @@
 			<key>name</key>
 			<string>Unprotected Akamai HLS stream</string>
 			<key>url</key>
-			<string>https://rtsvodww-vh.akamaihd.net/i/genhi/2018/genhi_20180126_full_f_1067247-,301k,101k,701k,1201k,2001k,fra-ad,.mp4.csmil/master.m3u8</string>
+			<string>https://rts-vod-amd.akamaized.net/ww/hls/10080791/545cbc27-0798-3d5e-ae1b-1aba03c9a5b5/master.m3u8</string>
 		</dict>
 		<dict>
 			<key>name</key>
@@ -20,7 +20,7 @@
 			<key>name</key>
 			<string>FairPlay-protected HLS live stream</string>
 			<key>url</key>
-			<string>https://rtsun-euwe.akamaized.net/5f6cc644-70fa-4adf-9f94-b673f9fe486f/rts1.ism/manifest(format=m3u8-aapl,encryption=cbcs-aapl,filter=nodvr)</string>
+			<string>https://rtsun-euwe.akamaized.net/31b0cff3-6652-4359-948c-9aa9063a7e9c/rts1.ism/manifest(format=m3u8-aapl,encryption=cbcs-aapl)</string>
 			<key>certificateUrl</key>
 			<string>https://srg.live.ott.irdeto.com/licenseServer/streaming/v1/SRG/getcertificate?applicationId=live</string>
 		</dict>

Demo/SRGContentProtection-demo.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		08E2AF6423108D8F00DCCE74 /* MediaDemoConfiguration.plist in Resources */ = {isa = PBXBuildFile; fileRef = 08E2AF6323108D8F00DCCE74 /* MediaDemoConfiguration.plist */; };
 		08E2AF6923108EBA00DCCE74 /* Media.m in Sources */ = {isa = PBXBuildFile; fileRef = 08E2AF6823108EBA00DCCE74 /* Media.m */; };
+		6F28354226E0A30C0079246B /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F28354126E0A30C0079246B /* SceneDelegate.m */; };
 		6F8A93FB20FDCAA800AA6434 /* LaunchScreen~ios.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6F8A93F020FDCAA800AA6434 /* LaunchScreen~ios.storyboard */; };
 		6F8A93FC20FDCAA800AA6434 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6F8A93F120FDCAA800AA6434 /* Images.xcassets */; };
 		6F8A93FD20FDCAA800AA6434 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F8A93F520FDCAA800AA6434 /* main.m */; };
@@ -25,6 +26,8 @@
 		08E2AF6723108EBA00DCCE74 /* Media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Media.h; sourceTree = "<group>"; };
 		08E2AF6823108EBA00DCCE74 /* Media.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Media.m; sourceTree = "<group>"; };
 		6F0432BC21006E7A002B090A /* SRGNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SRGNetwork.framework; path = Carthage/Build/iOS/SRGNetwork.framework; sourceTree = "<group>"; };
+		6F28354026E0A30C0079246B /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
+		6F28354126E0A30C0079246B /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
 		6F8A93D820FDCA0800AA6434 /* SRGContentProtection-demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SRGContentProtection-demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6F8A93F020FDCAA800AA6434 /* LaunchScreen~ios.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "LaunchScreen~ios.storyboard"; sourceTree = "<group>"; };
 		6F8A93F120FDCAA800AA6434 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
@@ -107,6 +110,8 @@
 				6F8A93F420FDCAA800AA6434 /* AppDelegate.h */,
 				6F8A93F620FDCAA800AA6434 /* AppDelegate.m */,
 				6F8A93F520FDCAA800AA6434 /* main.m */,
+				6F28354026E0A30C0079246B /* SceneDelegate.h */,
+				6F28354126E0A30C0079246B /* SceneDelegate.m */,
 			);
 			path = Application;
 			sourceTree = "<group>";
@@ -161,7 +166,7 @@
 		6F0EB52820FC7F58009C02CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6F8A93D720FDCA0800AA6434 = {
@@ -211,6 +216,7 @@
 			files = (
 				6F8A93FE20FDCAA800AA6434 /* AppDelegate.m in Sources */,
 				6F8A93FD20FDCAA800AA6434 /* main.m in Sources */,
+				6F28354226E0A30C0079246B /* SceneDelegate.m in Sources */,
 				08E2AF6923108EBA00DCCE74 /* Media.m in Sources */,
 				6F8A93FF20FDCAA800AA6434 /* DemosViewController.m in Sources */,
 			);

Demo/SRGContentProtection-demo.xcodeproj/xcshareddata/xcschemes/SRGContentProtection-demo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Demo/SRGContentProtection-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -24,26 +24,26 @@
         "repositoryURL": "https://github.com/SRGSSR/srgdiagnostics-apple.git",
         "state": {
           "branch": null,
-          "revision": "5d2ef5c833a5cf6e56762a9c506e73f58ccad5e8",
-          "version": "3.0.0"
+          "revision": "9921cec150a83df60fe4cde41ffb9e3209b21e92",
+          "version": "3.0.2"
         }
       },
       {
         "package": "SRGLogger",
         "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
         "state": {
           "branch": null,
-          "revision": "cfc39d1223ed039aeb7df38c6c7570977b22d1aa",
-          "version": "3.0.0"
+          "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb",
+          "version": "3.0.2"
         }
       },
       {
         "package": "SRGNetwork",
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "734fe399088b2f846e9e69d48a43118f6a8dc0d2",
-          "version": "3.0.0"
+          "revision": "9d79d6649de885876577c28e7b19f24f7ce16399",
+          "version": "3.0.3"
         }
       }
     ]

Demo/Sources/Application/AppDelegate.m

@@ -8,18 +8,30 @@
 
 #import "DemosViewController.h"
 
+@import AVFoundation;
+
 @implementation AppDelegate
 
 #pragma mark UIApplicationDelegate protocol
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-    self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
-    [self.window makeKeyAndVisible];
+    [AVAudioSession.sharedInstance setCategory:AVAudioSessionCategoryPlayback error:NULL];
 
-    DemosViewController *demosViewController = [[DemosViewController alloc] init];
-    self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:demosViewController];
+    if (@available(iOS 13, tvOS 13, *)) {}
+    else {
+        self.window = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
+        [self.window makeKeyAndVisible];
+
+        DemosViewController *demosViewController = [[DemosViewController alloc] init];
+        self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:demosViewController];
+    }
     return YES;
 }
 
+- (UISceneConfiguration *)application:(UIApplication *)application configurationForConnectingSceneSession:(UISceneSession *)connectingSceneSession options:(UISceneConnectionOptions *)options API_AVAILABLE(ios(13.0))
+{
+    return [[UISceneConfiguration alloc] initWithName:@"Default" sessionRole:connectingSceneSession.role];
+}
+
 @end

Demo/Sources/Application/SceneDelegate.h

@@ -0,0 +1,18 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+@import UIKit;
+
+NS_ASSUME_NONNULL_BEGIN
+
+API_AVAILABLE(ios(13.0))
+@interface SceneDelegate : UIResponder <UIWindowSceneDelegate>
+
+@property (nonatomic) UIWindow *window;
+
+@end
+
+NS_ASSUME_NONNULL_END

Demo/Sources/Application/SceneDelegate.m

@@ -0,0 +1,25 @@
+//
+//  Copyright (c) SRG SSR. All rights reserved.
+//
+//  License information is available from the LICENSE file.
+//
+
+#import "SceneDelegate.h"
+
+#import "DemosViewController.h"
+
+@implementation SceneDelegate
+
+- (void)scene:(UIScene *)scene willConnectToSession:(UISceneSession *)session options:(UISceneConnectionOptions *)connectionOptions
+{
+    if ([scene isKindOfClass:UIWindowScene.class]) {
+        UIWindowScene *windowScene = (UIWindowScene *)scene;
+        self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
+        [self.window makeKeyAndVisible];
+
+        DemosViewController *demosViewController = [[DemosViewController alloc] init];
+        self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:demosViewController];
+    }
+}
+
+@end

Gemfile

@@ -7,6 +7,7 @@
 source 'https://rubygems.org'
 
 gem 'fastlane'
+gem 'xcode-install'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)