Skip to content

Commit

Permalink
feat(FEC-9314): update Shaka version (#268)
Browse files Browse the repository at this point in the history
remove patches and fixes that wrote for Shaka previous version.
  • Loading branch information
Yuvalke authored Sep 12, 2019
1 parent d8b807f commit 0739090
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"js-logger": "^1.3.0",
"playkit-js-providers": "https://github.com/kaltura/playkit-js-providers.git#v2.20.2",
"proxy-polyfill": "^0.3.0",
"shaka-player": "https://github.com/kaltura/shaka-player.git#v2.3.3-k-5"
"shaka-player": "^2.5.5"
},
"repository": {
"type": "git",
Expand Down
6 changes: 1 addition & 5 deletions src/common/utils/setup-helpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @flow
import {setDefaultAnalyticsPlugin} from 'player-defaults';
import {Env, TextStyle, Utils, setCapabilities, EngineType, DrmScheme} from '@playkit-js/playkit-js';
import {Env, TextStyle, Utils, setCapabilities, EngineType} from '@playkit-js/playkit-js';
import {ValidationErrorType} from './validation-error';
import StorageManager from '../storage/storage-manager';
import type {LogLevelObject} from './logger';
Expand Down Expand Up @@ -367,10 +367,6 @@ function configureLGTVDefaultOptions(options: KPOptionsObject): void {
setCapabilities(EngineType.HTML5, {autoplay: true});
_configureAdsWithMSE(options);

const keySystem = Utils.Object.getPropertyPath(options, 'drm.keySystem');
if (!keySystem) {
options = Utils.Object.createPropertyPath(options, 'drm.keySystem', DrmScheme.WIDEVINE);
}
if (options.plugins && options.plugins.ima) {
const imaForceReload = Utils.Object.getPropertyPath(options, 'plugins.ima.forceReloadMediaAfterAds');
const delayUntilSourceSelected = Utils.Object.getPropertyPath(options, 'plugins.ima.delayInitUntilSourceSelected');
Expand Down
7 changes: 4 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7502,9 +7502,10 @@ sha.js@^2.4.0, sha.js@^2.4.8:
inherits "^2.0.1"
safe-buffer "^5.0.1"

"shaka-player@https://github.com/kaltura/shaka-player.git#v2.3.3-k-5":
version "2.3.3"
resolved "https://github.com/kaltura/shaka-player.git#3658b46869799f52863a7ed7b84bee4701d8c400"
shaka-player@^2.5.5:
version "2.5.5"
resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-2.5.5.tgz#81e7265f28f631afd3837c06ec6637824bda71e4"
integrity sha512-YEWBFapWKjwy2+wIgH9NqoFW9A14LIYNAoJ9cQr3c9BGS7qjqxeiYM/H1BJ8so1FQexpsWUdyjwHvcspdc7/nw==

shebang-command@^1.2.0:
version "1.2.0"
Expand Down

0 comments on commit 0739090

Please sign in to comment.