From ed0f58841c4fa674cabaf4e5948aef6fe6a7eacf Mon Sep 17 00:00:00 2001 From: Pierre-Yves Bertholon Date: Thu, 3 Aug 2023 19:42:50 +0200 Subject: [PATCH 1/7] Bump version number --- Demo/Demo.xcconfig | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig index 42d325de..ae90055e 100644 --- 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/Package.swift b/Package.swift index 5d31439a..177b6ecf 100644 --- 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( From 8fe32cfee2b1eb34396fa4b9c1654bd238b28b5e Mon Sep 17 00:00:00 2001 From: Pierre-Yves B Date: Fri, 6 Oct 2023 09:23:39 +0200 Subject: [PATCH 2/7] Xcode 15 with iOS 17 and tvOS 17 (#126) --- .../xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme | 2 +- .xcode-version | 2 +- Demo/SRGMediaPlayer-demo.xcodeproj/project.pbxproj | 7 +++++-- .../xcshareddata/xcschemes/SRGMediaPlayer-demo.xcscheme | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme index 499cdd45..e1fad6ad 100644 --- a/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme +++ b/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme @@ -1,6 +1,6 @@ Date: Mon, 4 Dec 2023 22:26:30 +0100 Subject: [PATCH 3/7] Build and test with Xcode 15.0.1 (#131) --- .xcode-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xcode-version b/.xcode-version index 3d3be3c3..9dc738e6 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -15.0 \ No newline at end of file +15.0.1 \ No newline at end of file From 85945459a5c0ec50502bd903c8e9616ae5ec6530 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Date: Wed, 13 Mar 2024 00:06:11 +0100 Subject: [PATCH 4/7] Build and test with Xcode 15.3 (#132) --- .xcode-version | 2 +- fastlane/Fastfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.xcode-version b/.xcode-version index 9dc738e6..8e0f4114 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -15.0.1 \ No newline at end of file +15.3 \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 5c9ea31e..5f104e37 100644 --- 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] From 0bde6bb243e9f84b7ea5386e64cbee5e087e64a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 May 2024 18:23:05 +0200 Subject: [PATCH 5/7] Bump rexml from 3.2.5 to 3.2.8 (#133) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ef6facd5..7a393144 100644 --- 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) From cab3a29aa3087eeccbc910cac31eb26cf94fb0d7 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Date: Mon, 3 Jun 2024 23:28:47 +0200 Subject: [PATCH 6/7] Build and test with Xcode 15.4 (#134) --- .xcode-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xcode-version b/.xcode-version index 8e0f4114..441e3fb3 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -15.3 \ No newline at end of file +15.4 \ No newline at end of file From fab4f77ec0f6effcb8c3d08e0e006db0219ac8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20D=C3=A9fago?= Date: Thu, 25 Jul 2024 09:57:58 +0200 Subject: [PATCH 7/7] Always seek to the start position to mitigate impact of timestamp misalignments (#135) --- .../SRGMediaPlayer/SRGMediaPlayerController.m | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Sources/SRGMediaPlayer/SRGMediaPlayerController.m b/Sources/SRGMediaPlayer/SRGMediaPlayerController.m index 0d144448..5389a1eb 100644 --- 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) {