FEC-10389 Add support for referenceId filter in provider (#28)

* FEC-10389 Add support for referenceId filter in provider (#23) * MediaEntry Interceptors business logic for KalturaPlayer and KalturaOTTPlayer. * code fixes * - PKMediaEntryInterceptor protocol definition moved to Sources/Basic/Interceptor/ - KalturaPlayer.swift internal getter for interceptors changed to use generic getLoadedPlugins function. - Podspec modified to include PKMediaEntryInterceptor in "Core" subspec, also added "Interceptor" subspec to include only PKMediaEntryInterceptor for other development needs. * Update KalturaPlayer.swift Minor code style fixes. * Update KalturaPlayer.podspec renamed to playkitVersion * Update KalturaPlayer.podspec Co-authored-by: Noam Tamim <[email protected]> * Update KalturaPlayer.podspec Co-authored-by: Noam Tamim <[email protected]> * Update Sources/Basic/Interceptor/PKMediaEntryInterceptor.swift Co-authored-by: Nilit Danan <[email protected]> * interceptor.apply minor code style fixes * Interceptor related code moved to extension of KalturaPlayer class. * Interceptor podspec fixes * Removed parameter callback from internal func updateMediaEntryWithLoadedInterceptors(_ mediaEntry: PKMediaEntry) * podspec updated * PKMediaEntryInterceptor protocol changed * Update Sources/Interceptor/PKMediaEntryInterceptor.swift Co-authored-by: Nilit Danan <[email protected]> * updateMediaEntryWithLoadedInterceptors() callback added * FEC-10389 Add support for referenceId filter in provider. Changes required for player. Co-authored-by: Noam Tamim <[email protected]> Co-authored-by: Nilit Danan <[email protected]> * Cherry picked last change. * Attempt to fix Travis script * Attempt to fix Travis script. * PlayKitProviders dependency updated to 1.12 Co-authored-by: Sergey Chausov <[email protected]> Co-authored-by: Noam Tamim <[email protected]>
kaltura · Mar 15, 2021 · 1fb75ee · 1fb75ee
1 parent 26ec355
commit 1fb75ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/KalturaPlayer.podspec b/KalturaPlayer.podspec
@@ -43,7 +43,7 @@ Pod::Spec.new do |s|
     sp.resources = 'Sources/OTT/*.xcdatamodeld'
 
     sp.dependency 'KalturaPlayer/Core'
-    sp.dependency 'PlayKitProviders', '~> 1.11'
+    sp.dependency 'PlayKitProviders', '~> 1.12'
     sp.dependency 'PlayKitKava', '~> 1.6'
   end
 
@@ -52,7 +52,7 @@ Pod::Spec.new do |s|
     sp.resources = 'Sources/OVP/*.xcdatamodeld'
 
     sp.dependency 'KalturaPlayer/Core'
-    sp.dependency 'PlayKitProviders', '~> 1.11'
+    sp.dependency 'PlayKitProviders', '~> 1.12'
     sp.dependency 'PlayKitKava', '~> 1.6'
   end
 
@@ -82,7 +82,7 @@ Pod::Spec.new do |s|
     sp.resources = 'Sources/OTT/*.xcdatamodeld'
 
     sp.dependency 'KalturaPlayer/Offline'
-    sp.dependency 'PlayKitProviders', '~> 1.11'
+    sp.dependency 'PlayKitProviders', '~> 1.12'
     sp.dependency 'PlayKitKava', '~> 1.6'
 
     sp.xcconfig = {
@@ -99,7 +99,7 @@ Pod::Spec.new do |s|
     sp.resources = 'Sources/OVP/*.xcdatamodeld'
 
     sp.dependency 'KalturaPlayer/Offline'
-    sp.dependency 'PlayKitProviders', '~> 1.11'
+    sp.dependency 'PlayKitProviders', '~> 1.12'
     sp.dependency 'PlayKitKava', '~> 1.6'
 
     sp.xcconfig = {

diff --git a/Sources/OVP/OVPMediaOptions.swift b/Sources/OVP/OVPMediaOptions.swift
@@ -12,11 +12,13 @@ import PlayKitProviders
 
     @objc public var ks: String?
     @objc public var entryId: String?
+    @objc public var referenceId: String?
     @objc public var uiconfId: NSNumber?
 
     internal func mediaProvider() -> OVPMediaProvider {
         let ovpMediaProvider = OVPMediaProvider()
         ovpMediaProvider.set(entryId: entryId)
+        ovpMediaProvider.set(referenceId: referenceId)
         ovpMediaProvider.set(uiconfId: uiconfId)
 
         return ovpMediaProvider

diff --git a/travis-build.sh b/travis-build.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -eou pipefail
-
 # Travis aborts the build if it doesn't get output for 10 minutes.
 keepAlive() {
   while [ -f $1 ]
@@ -15,20 +13,16 @@ buildiOSApp() {
   echo Building the iOS TestApp
   cd iOSTestApp
   pod install
-  CODE=0
-  xcodebuild clean build -workspace iOSTestApp.xcworkspace -scheme iOSTestApp ONLY_ACTIVE_ARCH=NO | tee xcodebuild.log | xcpretty -r html || CODE=$?
+  xcodebuild clean build -workspace iOSTestApp.xcworkspace -scheme iOSTestApp ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=iPhone 11' | tee xcodebuild.log | xcpretty -r html && exit ${PIPESTATUS[0]}
   cd ../
-  export CODE
 }
 
 buildtvOSApp() {
   echo Building the tvOS TestApp
   cd tvOSTestApp
   pod install
-  CODE=0
-  xcodebuild clean build -workspace tvOSTestApp.xcworkspace -scheme tvOSTestApp ONLY_ACTIVE_ARCH=NO | tee xcodebuild.log | xcpretty -r html || CODE=$?
+  xcodebuild clean build -workspace tvOSTestApp.xcworkspace -scheme tvOSTestApp ONLY_ACTIVE_ARCH=NO -destination 'platform=tvOS Simulator,name=Apple TV' | tee xcodebuild.log | xcpretty -r html && exit ${PIPESTATUS[0]}
   cd ../
-  export CODE
 }
 
 libLint() {