Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 6 commits into from
Mar 15, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a82a6c1
FEC-10389 Add support for referenceId filter in provider (#23)
chausov Mar 1, 2021
15dec3b
Cherry picked last change.
x-NR-x Mar 1, 2021
0339c03
Merge branch 'develop' into FEC-10389
x-NR-x Mar 1, 2021
e462e9d
Attempt to fix Travis script
x-NR-x Mar 1, 2021
89f1fed
Attempt to fix Travis script.
x-NR-x Mar 2, 2021
eaf9e1a
PlayKitProviders dependency updated to 1.12
chausov Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions KalturaPlayer.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand Down
2 changes: 2 additions & 0 deletions Sources/OVP/OVPMediaOptions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions travis-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ]
Expand All @@ -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() {
Expand Down