Skip to content

Commit

Permalink
Merge branch 'develop' into release/0.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Eliza Sapir committed May 10, 2017
2 parents a8e5cca + 2304e23 commit 149752b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion PlayKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ s.subspec 'IMAPlugin' do |ssp|
'LIBRARY_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}"/**'
}
ssp.dependency 'PlayKit/Core'
ssp.dependency 'GoogleAds-IMA-iOS-SDK', '3.5.2'
ssp.dependency 'GoogleAds-IMA-iOS-SDK', '3.4.1'
end

s.subspec 'GoogleCastAddon' do |ssp|
Expand Down
2 changes: 1 addition & 1 deletion Plugins/IMA/IMAPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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, .STREAM_STARTED: break
case .AD_BREAK_ENDED, .AD_BREAK_STARTED, .CUEPOINTS_CHANGED, .STREAM_LOADED: break
}
}

Expand Down

0 comments on commit 149752b

Please sign in to comment.