Merge branch 'release/3.1.0'

SRGSSR · Aug 11, 2022 · 69420d0 · 69420d0
2 parents 6bbd897 + 63652fc
commit 69420d0
Show file tree

Hide file tree

Showing 21 changed files with 186 additions and 156 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ xcuserdata
 /fastlane/*.xml
 
 /vendor
-/.bundle
+/.bundle
+
+.vscode
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,16 +4,15 @@ inherit_mode:
 
 AllCops:
   Exclude:
-    - 'Carthage/**/*'
-    - 'Demo/Carthage/**/*'
     - 'vendor/**/*'
   Include:
     - 'fastlane/Pluginfile'
+  NewCops: enable
 
 # this would cause errors with long lanes
 Metrics/BlockLength:
   Enabled: true
-  ExcludedMethods: ['platform', 'for_platform']
+  IgnoredMethods: ['platform', 'for_platform']
 
 # Lane description and gem lines can be long
 Layout/LineLength:

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,17 @@
+disabled_rules:
+    - identifier_name
+    - statement_position
+    - todo
+
+line_length: 300
+
+trailing_whitespace:
+  ignores_empty_lines: true
+  severity: warning
+
+nesting:
+  type_level: 2
+
+excluded:
+  - .build
+  - vendor
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGContentProtection.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGContentProtection.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,8 +1,8 @@
 // Version information
-MARKETING_VERSION = 3.0.4
+MARKETING_VERSION = 3.1.0
 
 // Deployment targets
-IPHONEOS_DEPLOYMENT_TARGET = 9.0
+IPHONEOS_DEPLOYMENT_TARGET = 12.0
 TVOS_DEPLOYMENT_TARGET = 12.0
 
 // Configuration to have a single target built for all platforms

diff --git a/Demo/Resources/MediaDemoConfiguration.plist b/Demo/Resources/MediaDemoConfiguration.plist
@@ -8,13 +8,13 @@
 			<key>name</key>
 			<string>Unprotected Akamai HLS stream</string>
 			<key>url</key>
-			<string>https://rts-vod-amd.akamaized.net/ww/hls/10080791/545cbc27-0798-3d5e-ae1b-1aba03c9a5b5/master.m3u8</string>
+			<string>https://rts-vod-amd.akamaized.net/ww/13228673/edf35ff9-3ec1-3d47-9b9d-df5a3fa7f159/master.m3u8</string>
 		</dict>
 		<dict>
 			<key>name</key>
 			<string>Akamai token-protected HLS stream</string>
 			<key>url</key>
-			<string>https://srgssruni11ch-lh.akamaihd.net/i/enc11uni_ch@191455/master.m3u8</string>
+			<string>https://srgssrch.akamaized.net/hls/live/2022077/srgssr-hls-stream20-ch-dvr/master.m3u8</string>
 		</dict>
 		<dict>
 			<key>name</key>
@@ -56,7 +56,7 @@
 			<key>name</key>
 			<string>Akamai MP3 stream</string>
 			<key>url</key>
-			<string>https://srfaudio-a.akamaihd.net/delivery/world/75f44907-4638-422d-bc80-bbb14c9d9c93.mp3</string>
+			<string>https://rts-aod-dd.akamaized.net/ww/13141009/51a55d34-ce77-33ab-8a01-b01c4ffbc56f.mp3</string>
 		</dict>
 	</array>
 </dict>

diff --git a/Demo/SRGContentProtection-demo.xcodeproj/project.pbxproj b/Demo/SRGContentProtection-demo.xcodeproj/project.pbxproj
@@ -166,7 +166,7 @@
 		6F0EB52820FC7F58009C02CF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1400;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					6F8A93D720FDCA0800AA6434 = {
@@ -262,6 +262,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -325,6 +326,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

diff --git a/...ontentProtection-demo.xcodeproj/xcshareddata/xcschemes/SRGContentProtection-demo.xcscheme b/...ontentProtection-demo.xcodeproj/xcshareddata/xcschemes/SRGContentProtection-demo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Demo/SRGContentProtection-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGContentProtection-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,44 +6,44 @@
         "repositoryURL": "https://github.com/SRGSSR/libextobjc.git",
         "state": {
           "branch": null,
-          "revision": "30ee5b73bdf57a826978aa146881277f22369be1",
-          "version": "0.6.0-srg3"
+          "revision": "9c9a7327410fe3f7cdb695965ced43b9a7766ee0",
+          "version": "0.6.0-srg4"
         }
       },
       {
         "package": "MAKVONotificationCenter",
         "repositoryURL": "https://github.com/SRGSSR/MAKVONotificationCenter.git",
         "state": {
           "branch": null,
-          "revision": "60395e0601ffd4a784856b423d4cac558366276d",
-          "version": "1.0.0-srg5"
+          "revision": "8bde3cdc872085bd31f4cfe546bdf8e6932a0806",
+          "version": "1.0.0-srg6"
         }
       },
       {
         "package": "SRGDiagnostics",
         "repositoryURL": "https://github.com/SRGSSR/srgdiagnostics-apple.git",
         "state": {
           "branch": null,
-          "revision": "9921cec150a83df60fe4cde41ffb9e3209b21e92",
-          "version": "3.0.2"
+          "revision": "c595e8f186eb41335f0ea48848543ab3804ea22e",
+          "version": "3.1.0"
         }
       },
       {
         "package": "SRGLogger",
         "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
         "state": {
           "branch": null,
-          "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb",
-          "version": "3.0.2"
+          "revision": "dd98468422044b53e283d970809b8502e1ef5b8d",
+          "version": "3.1.0"
         }
       },
       {
         "package": "SRGNetwork",
         "repositoryURL": "https://github.com/SRGSSR/srgnetwork-apple.git",
         "state": {
           "branch": null,
-          "revision": "9d79d6649de885876577c28e7b19f24f7ce16399",
-          "version": "3.0.3"
+          "revision": "153a2544391c1aaccae2d38d8b113fd0a03421b8",
+          "version": "3.1.0"
         }
       }
     ]

diff --git a/Demo/Sources/Demos/DemosViewController.m b/Demo/Sources/Demos/DemosViewController.m
@@ -147,7 +147,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 
     AVPlayerViewController *playerViewController = [[AVPlayerViewController alloc] init];
     playerViewController.player = player;
-    if (@available(iOS 9, tvOS 14, *)) {
+    if (@available(iOS 12, tvOS 14, *)) {
         playerViewController.allowsPictureInPicturePlayback = NO;
     }
 

diff --git a/Gemfile b/Gemfile
@@ -8,6 +8,3 @@ 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)