Merge branch 'release/7.1.0'

SRGSSR · Aug 11, 2022 · 0e59937 · 0e59937
2 parents 00ed47f + 1f8f691
commit 0e59937
Show file tree

Hide file tree

Showing 32 changed files with 123 additions and 380 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -69,6 +69,9 @@
                ReferencedContainer = "container:">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "PlaybackTestCase/testFixedStreamEndWithBuggyAkamaiMLS3StreamWithSubtitles">
+               </Test>
                <Test
                   Identifier = "PlaybackTestCase/testOnDemandPlaybackStartAtTimeWithTolerances">
                </Test>

diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig
@@ -1,8 +1,8 @@
 // Version information
-MARKETING_VERSION = 7.0.3
+MARKETING_VERSION = 7.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/SRGMediaPlayer-demo.xcodeproj/project.pbxproj b/Demo/SRGMediaPlayer-demo.xcodeproj/project.pbxproj
@@ -358,7 +358,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1330;
+				LastUpgradeCheck = 1400;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					E69A1E661D61BEFC0064E6C1 = {
@@ -494,6 +494,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
+				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = "$(BUILD_NUMBER)";
 				DYLIB_CURRENT_VERSION = "$(BUILD_NUMBER)";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -546,6 +547,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = "$(BUILD_NUMBER)";
+				DEAD_CODE_STRIPPING = YES;
 				DYLIB_COMPATIBILITY_VERSION = "$(BUILD_NUMBER)";
 				DYLIB_CURRENT_VERSION = "$(BUILD_NUMBER)";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -568,7 +570,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6FCAB6D5231681C00043432E /* Demo.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -595,7 +596,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 6FCAB6D5231681C00043432E /* Demo.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICONS_SOURCE)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

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

diff --git a/Demo/SRGMediaPlayer-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/SRGMediaPlayer-demo.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,26 +6,26 @@
         "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": "SRGLogger",
         "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
         "state": {
           "branch": null,
-          "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb",
-          "version": "3.0.2"
+          "revision": "dd98468422044b53e283d970809b8502e1ef5b8d",
+          "version": "3.1.0"
         }
       }
     ]

diff --git a/Demo/Sources/Players/Advanced/AdvancedPlayerViewController~ios.m b/Demo/Sources/Players/Advanced/AdvancedPlayerViewController~ios.m
@@ -139,21 +139,9 @@ - (void)viewDidLoad
                                            selector:@selector(playbackDidFail:)
                                                name:SRGMediaPlayerPlaybackDidFailNotification
                                              object:self.mediaPlayerController];
-
-    NSNotificationName voiceOverNotificationName = nil;
-#if !TARGET_OS_MACCATALYST
-    if (@available(iOS 11, *)) {
-#endif
-        voiceOverNotificationName = UIAccessibilityVoiceOverStatusDidChangeNotification;
-#if !TARGET_OS_MACCATALYST
-    }
-    else {
-        voiceOverNotificationName = UIAccessibilityVoiceOverStatusChanged;
-    }
-#endif
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(accessibilityVoiceOverStatusDidChange:)
-                                               name:voiceOverNotificationName
+                                               name:UIAccessibilityVoiceOverStatusDidChangeNotification
                                              object:nil];
 
     @weakify(self)
@@ -195,9 +183,7 @@ - (void)viewDidAppear:(BOOL)animated
         }
     }
 
-    if (@available(iOS 11, *)) {
-        [self setNeedsUpdateOfHomeIndicatorAutoHidden];
-    }
+    [self setNeedsUpdateOfHomeIndicatorAutoHidden];
 }
 
 - (void)viewDidDisappear:(BOOL)animated
@@ -326,9 +312,7 @@ - (void)setUserInterfaceHidden:(BOOL)hidden animated:(BOOL)animated
             animations();
             [self.view layoutIfNeeded];
         } completion:^(BOOL finished) {
-            if (@available(iOS 11, *)) {
-                [self setNeedsUpdateOfHomeIndicatorAutoHidden];
-            }
+            [self setNeedsUpdateOfHomeIndicatorAutoHidden];
         }];
     }
     else {

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,23 +8,23 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.597.0)
-    aws-sdk-core (3.131.1)
+    aws-partitions (1.616.0)
+    aws-sdk-core (3.132.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
+    aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    claide (1.0.3)
+    claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
@@ -34,10 +34,10 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.92.3)
-    faraday (1.10.0)
+    excon (0.92.4)
+    faraday (1.10.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.206.2)
+    fastlane (2.208.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -106,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.21.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.5.0)
+    google-apis-androidpublisher_v3 (0.25.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,27 +117,27 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.14.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.13.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-playcustomapp_v1 (0.10.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-storage_v1 (0.17.0)
+      google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.2)
+    google-cloud-storage (1.38.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.17.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.3)
+    googleauth (1.2.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -173,9 +173,9 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.1)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -196,10 +196,10 @@ GEM
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcode-install (2.8.0)
-      claide (>= 0.9.1, < 1.1.0)
+    xcode-install (2.8.1)
+      claide (>= 0.9.1)
       fastlane (>= 2.1.0, < 3.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

diff --git a/Package.resolved b/Package.resolved
@@ -6,26 +6,26 @@
         "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": "SRGLogger",
         "repositoryURL": "https://github.com/SRGSSR/srglogger-apple.git",
         "state": {
           "branch": null,
-          "revision": "5840af9ccbbc23a1269ff53feb3832f56ffde1eb",
-          "version": "3.0.2"
+          "revision": "dd98468422044b53e283d970809b8502e1ef5b8d",
+          "version": "3.1.0"
         }
       }
     ]

diff --git a/Package.swift b/Package.swift
@@ -3,14 +3,14 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "7.0.3"
+    static let marketingVersion: String = "7.1.0"
 }
 
 let package = Package(
     name: "SRGMediaPlayer",
     defaultLocalization: "en",
     platforms: [
-        .iOS(.v9),
+        .iOS(.v12),
         .tvOS(.v12)
     ],
     products: [
@@ -20,9 +20,9 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "libextobjc", url: "https://github.com/SRGSSR/libextobjc.git", .exact("0.6.0-srg3")),
-        .package(name: "MAKVONotificationCenter", url: "https://github.com/SRGSSR/MAKVONotificationCenter.git", .exact("1.0.0-srg5")),
-        .package(name: "SRGLogger", url: "https://github.com/SRGSSR/srglogger-apple.git", .upToNextMinor(from: "3.0.0"))
+        .package(name: "libextobjc", url: "https://github.com/SRGSSR/libextobjc.git", .exact("0.6.0-srg4")),
+        .package(name: "MAKVONotificationCenter", url: "https://github.com/SRGSSR/MAKVONotificationCenter.git", .exact("1.0.0-srg6")),
+        .package(name: "SRGLogger", url: "https://github.com/SRGSSR/srglogger-apple.git", .upToNextMinor(from: "3.1.0"))
     ],
     targets: [
         .target(

diff --git a/Sources/SRGMediaPlayer/AVPlayerItem+SRGMediaPlayer.h b/Sources/SRGMediaPlayer/AVPlayerItem+SRGMediaPlayer.h