Merge branch 'develop' into release/0.1.x

kaltura · Apr 19, 2017 · 2f0e824 · 2f0e824
2 parents 6436f2a + 785e68d
commit 2f0e824
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Classes/Providers/OTT/Services/OTTAssetService.swift b/Classes/Providers/OTT/Services/OTTAssetService.swift
@@ -17,8 +17,8 @@ class OTTAssetService {
             request
             .setBody(key: "id", value: JSON(assetId))
             .setBody(key: "ks", value: JSON(ks))
-            .setBody(key: "type", value: JSON(type.rawValue))
-            .setBody(key: "assetReferenceType", value: JSON(type.rawValue))
+            .setBody(key: "type", value: JSON(type.asString))
+            .setBody(key: "assetReferenceType", value: JSON(type.asString))
             .setBody(key: "with", value: JSON([["type": "files", "objectType": "KalturaCatalogWithHolder"]]))
             return request
         } else {
@@ -32,7 +32,7 @@ class OTTAssetService {
             request
             .setBody(key: "assetId", value: JSON(assetId))
             .setBody(key: "ks", value: JSON(ks))
-            .setBody(key: "assetType", value: JSON(type.rawValue))
+            .setBody(key: "assetType", value: JSON(type.asString))
             .setBody(key: "contextDataParams", value: JSON(playbackContextOptions.toDictionary()))
             return request
         } else {
@@ -51,7 +51,7 @@ struct PlaybackContextOptions {
     func toDictionary() -> [String: Any] {
 
         var dict: [String: Any] = [:]
-        dict["context"] = playbackContextType.rawValue
+        dict["context"] = playbackContextType.asString
         dict["mediaProtocols"] = protocls
         if let fileIds = self.assetFileIds {
             dict["assetFileIds"] = fileIds.joined(separator: ",")

diff --git a/PlayKit.podspec b/PlayKit.podspec
@@ -38,7 +38,7 @@ s.subspec 'GoogleCastAddon' do |ssp|
         'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}"/**',
         'LIBRARY_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}"/**' 
     }
-    ssp.dependency 'google-cast-sdk'
+    ssp.dependency 'google-cast-sdk', '3.3.0'
     ssp.dependency 'PlayKit/Core'
 end