Merge branch 'release/0.3.x' into release/widevine/0.3.x

kaltura · May 29, 2017 · b545bb8 · b545bb8
2 parents 955b622 + ce75827
commit b545bb8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,41 +2,41 @@ PODS:
   - google-cast-sdk (3.3.0):
     - google-cast-sdk/Core (= 3.3.0)
   - google-cast-sdk/Core (3.3.0)
-  - GoogleAds-IMA-iOS-SDK (3.4.1)
-  - KalturaNetKit (0.0.11):
-    - KalturaNetKit/Core (= 0.0.11)
-  - KalturaNetKit/Core (0.0.11):
+  - GoogleAds-IMA-iOS-SDK (3.5.2)
+  - KalturaNetKit (0.0.14):
+    - KalturaNetKit/Core (= 0.0.14)
+  - KalturaNetKit/Core (0.0.14):
     - SwiftyJSON
   - Log (1.0)
   - Nimble (6.0.1)
-  - PlayKit (0.1.x-dev):
-    - PlayKit/Core (= 0.1.x-dev)
-  - PlayKit/AnalyticsCommon (0.1.x-dev):
+  - PlayKit (0.3.0.rc1):
+    - PlayKit/Core (= 0.3.0.rc1)
+  - PlayKit/AnalyticsCommon (0.3.0.rc1):
     - PlayKit/Core
-  - PlayKit/Core (0.1.x-dev):
-    - KalturaNetKit
-    - Log
-    - SwiftyJSON
-    - SwiftyXMLParser
-  - PlayKit/GoogleCastAddon (0.1.x-dev):
-    - google-cast-sdk
+  - PlayKit/Core (0.3.0.rc1):
+    - KalturaNetKit (~> 0.0)
+    - Log (= 1.0)
+    - SwiftyJSON (= 3.1.4)
+    - SwiftyXMLParser (= 3.0.0)
+  - PlayKit/GoogleCastAddon (0.3.0.rc1):
+    - google-cast-sdk (= 3.3.0)
     - PlayKit/Core
-  - PlayKit/IMAPlugin (0.1.x-dev):
-    - GoogleAds-IMA-iOS-SDK (= 3.4.1)
+  - PlayKit/IMAPlugin (0.3.0.rc1):
+    - GoogleAds-IMA-iOS-SDK (= 3.5.2)
     - PlayKit/Core
-  - PlayKit/KalturaLiveStatsPlugin (0.1.x-dev):
+  - PlayKit/KalturaLiveStatsPlugin (0.3.0.rc1):
     - PlayKit/AnalyticsCommon
     - PlayKit/Core
-  - PlayKit/KalturaStatsPlugin (0.1.x-dev):
+  - PlayKit/KalturaStatsPlugin (0.3.0.rc1):
     - PlayKit/AnalyticsCommon
     - PlayKit/Core
-  - PlayKit/PhoenixPlugin (0.1.x-dev):
+  - PlayKit/PhoenixPlugin (0.3.0.rc1):
     - PlayKit/AnalyticsCommon
     - PlayKit/Core
-  - PlayKit/YouboraPlugin (0.1.x-dev):
+  - PlayKit/YouboraPlugin (0.3.0.rc1):
     - PlayKit/AnalyticsCommon
     - PlayKit/Core
-    - Youbora-AVPlayer/dynamic
+    - Youbora-AVPlayer/dynamic (= 5.3.5)
   - Quick (1.1.0)
   - SwiftyJSON (3.1.4)
   - SwiftyXMLParser (3.0.0)
@@ -62,11 +62,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   google-cast-sdk: da1989cbc1b9ff7b50ddb9dae5b1969d95a65a0f
-  GoogleAds-IMA-iOS-SDK: 7355db22ce69be4607ed0cc5112847b2b0c5e89d
-  KalturaNetKit: b6bc21d1ffb6957192c33afc12f5c2203d5208b2
+  GoogleAds-IMA-iOS-SDK: a0692ecc51d7c8816d5245edfb8a69c553cd84d4
+  KalturaNetKit: bd3825d14e604c9f06bb41607eb6ce8929f27556
   Log: 5e368c9528db07517d18d2d04ff5fe2b6f5a1e21
   Nimble: 1527fd1bd2b4cf0636251a36bc8ab37e81da8347
-  PlayKit: c50b4b7582aa7bef031bb34e15b6ca2303093525
+  PlayKit: 583c2d0e7ee7e0d5039a5902b2341e1199332339
   Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
   SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220
   SwiftyXMLParser: 8d2295fb4fbc6e2ff241e7c8d7717e159be35969

diff --git a/Plugins/IMA/IMAPlugin.swift b/Plugins/IMA/IMAPlugin.swift
@@ -311,7 +311,7 @@ enum IMAState: Int, StateProtocol {
         case .TAPPED: self.notify(event: AdEvent.AdTapped())
         case .THIRD_QUARTILE: self.notify(event: AdEvent.AdThirdQuartile())
         // Only used for dynamic ad insertion (not officially supported)
-        case .AD_BREAK_ENDED, .AD_BREAK_STARTED, .CUEPOINTS_CHANGED, .STREAM_LOADED: break
+        case .AD_BREAK_ENDED, .AD_BREAK_STARTED, .CUEPOINTS_CHANGED, .STREAM_LOADED, .STREAM_STARTED: break
         }
     }