From 773141eaab8f19999f3b06edaa4418075301cd1d Mon Sep 17 00:00:00 2001 From: LamineNdy Date: Mon, 2 Dec 2019 17:14:49 +0100 Subject: [PATCH] Bump Streamroot SDK version (#2) * Bunp Streamroot SDK version * Remove buffer target set at the beginning --- AVPlayerDNAPlugin.podspec | 6 +++--- Cartfile | 4 ++-- Cartfile.resolved | 4 ++-- PlayerDNAPlugin.xcodeproj/project.pbxproj | 12 ++++++++++++ PlayerDNAPlugin/Classes/AVPlayerPlugin.swift | 3 --- PlayerDNAPlugin/Info.plist | 2 +- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/AVPlayerDNAPlugin.podspec b/AVPlayerDNAPlugin.podspec index 5926ba3..927bf8c 100644 --- a/AVPlayerDNAPlugin.podspec +++ b/AVPlayerDNAPlugin.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'AVPlayerDNAPlugin' - s.version = '1.1.12' - s.swift_version = '5.0' + s.version = '1.1.13' + s.swift_version = '5.1' s.summary = 'Streamroot Distributed Network Architecture AVPlayer plugins, a new way to deliver large-scale OTT video' s.homepage = 'https://www.streamroot.io/' s.author = { 'Name' => 'support-team@streamroot.io' } @@ -14,5 +14,5 @@ Pod::Spec.new do |s| s.source_files = 'PlayerDNAPlugin/Classes/*.swift' s.ios.deployment_target = '10.2' s.tvos.deployment_target = '10.2' - s.dependency 'StreamrootSDK', '~> 3.15.1' + s.dependency 'StreamrootSDK', '~> 3.16.0' end \ No newline at end of file diff --git a/Cartfile b/Cartfile index d7b6b12..00fdd8c 100755 --- a/Cartfile +++ b/Cartfile @@ -1,4 +1,4 @@ -binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" ~> 3.15.1 -github "apple/swift-protobuf" "1.6.0" +binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" ~> 3.16.0 +github "apple/swift-protobuf" "1.7.0" github "daltoniam/Starscream" "3.1.0" github "getsentry/sentry-cocoa" "4.4.0" diff --git a/Cartfile.resolved b/Cartfile.resolved index 424086c..4941f33 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" "3.15.1" -github "apple/swift-protobuf" "1.6.0" +binary "https://sdk.streamroot.io/ios/StreamrootSDK.json" "3.16.0" +github "apple/swift-protobuf" "1.7.0" github "daltoniam/Starscream" "3.1.0" github "getsentry/sentry-cocoa" "4.4.0" diff --git a/PlayerDNAPlugin.xcodeproj/project.pbxproj b/PlayerDNAPlugin.xcodeproj/project.pbxproj index f82bb91..c680a72 100644 --- a/PlayerDNAPlugin.xcodeproj/project.pbxproj +++ b/PlayerDNAPlugin.xcodeproj/project.pbxproj @@ -475,6 +475,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; @@ -492,6 +493,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.13; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", @@ -530,6 +532,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; @@ -546,6 +549,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.13; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", @@ -712,6 +716,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; @@ -729,6 +734,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.13; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode-marker", @@ -749,6 +755,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; @@ -766,6 +773,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.13; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", @@ -822,6 +830,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; @@ -838,6 +847,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.13; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode-marker", @@ -858,6 +868,7 @@ CLANG_ENABLE_CODE_COVERAGE = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 0; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; @@ -874,6 +885,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MARKETING_VERSION = 1.1.13; OTHER_CFLAGS = ( "$(inherited)", "-fembed-bitcode", diff --git a/PlayerDNAPlugin/Classes/AVPlayerPlugin.swift b/PlayerDNAPlugin/Classes/AVPlayerPlugin.swift index a6820af..b548dad 100644 --- a/PlayerDNAPlugin/Classes/AVPlayerPlugin.swift +++ b/PlayerDNAPlugin/Classes/AVPlayerPlugin.swift @@ -75,9 +75,6 @@ import StreamrootSDK /// Link the plugin to the player @objc public func linkPlayer(_ player: AVPlayer?) throws { self.player = player - if #available(iOS 10.0, tvOS 10.0, *) { - self.player?.currentItem?.preferredForwardBufferDuration = dnaClient?.bufferTarget ?? 0 - } guard let playerItem = player?.currentItem else { return } NotificationCenter.default.addObserver(self, selector: #selector(handlePlayedToEndFail), diff --git a/PlayerDNAPlugin/Info.plist b/PlayerDNAPlugin/Info.plist index 179e300..75ac477 100644 --- a/PlayerDNAPlugin/Info.plist +++ b/PlayerDNAPlugin/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1.11 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION)