Merge branch 'release/7.2.2'

SRGSSR · Jul 26, 2024 · cbf8cf3 · cbf8cf3
2 parents 7176081 + fab4f77
commit cbf8cf3
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 23 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 = "1400"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

diff --git a/Demo/SRGMediaPlayer-demo.xcodeproj/project.pbxproj b/Demo/SRGMediaPlayer-demo.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -357,8 +357,9 @@
 		C201D8ED1A9DC1A40016C629 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = SRG;
-				LastUpgradeCheck = 1400;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = "SRG SSR";
 				TargetAttributes = {
 					E69A1E661D61BEFC0064E6C1 = {
@@ -498,6 +499,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_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -551,6 +553,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/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 = "1400"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -168,7 +168,8 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -181,6 +182,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)

diff --git a/Package.swift b/Package.swift
@@ -3,7 +3,7 @@
 import PackageDescription
 
 struct ProjectSettings {
-    static let marketingVersion: String = "7.2.1"
+    static let marketingVersion: String = "7.2.2"
 }
 
 let package = Package(

diff --git a/Sources/SRGMediaPlayer/SRGMediaPlayerController.m b/Sources/SRGMediaPlayer/SRGMediaPlayerController.m
@@ -234,20 +234,9 @@ - (void)setPlayer:(SRGPlayer *)player
                     };
 
                     SRGTimePosition *startTimePosition = [self timePositionForPosition:self.startPosition inSegment:self.targetSegment applyEndTolerance:YES];
-                    if (CMTIME_COMPARE_INLINE(startTimePosition.time, ==, kCMTimeZero)) {
-                        // Default position. Nothing to do.
-                        completionBlock(YES);
-                    }
-                    else {
-                        if (CMTIME_COMPARE_INLINE(startTimePosition.time, !=, kCMTimeZero)) {
-                            [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:^(BOOL finished) {
-                                completionBlock(finished);
-                            }];
-                        }
-                        else {
-                            completionBlock(YES);
-                        }
-                    }
+                    [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:^(BOOL finished) {
+                        completionBlock(finished);
+                    }];
                 }
             }
             else if (playerItem.status == AVPlayerItemStatusFailed) {

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -26,7 +26,7 @@ platform :ios do
     clean_result_files
     clean_derived_data
 
-    iphone14 = Device.new('iOS', 'iPhone 14')
+    iphone14 = Device.new('iOS', 'iPhone 15')
     appletv = Device.new('tvOS', 'Apple TV')
     devices = [iphone14, appletv]