Skip to content

Commit

Permalink
handle conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Eliza Sapir committed Feb 12, 2017
2 parents ac68549 + 42862b9 commit 1895aeb
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Classes/Managers/LocalAssetsManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public class LocalAssetsManager: NSObject {
}
}

@objc public protocol LocalDataStore: class {
@objc public protocol LocalDataStore {
func save(key: String, value: Data) throws
func load(key: String) throws -> Data
func remove(key: String) throws
Expand Down
2 changes: 1 addition & 1 deletion Classes/Player/Player.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import UIKit
import AVFoundation
import AVKit

@objc public protocol PlayerDelegate: class {
@objc public protocol PlayerDelegate {
func playerShouldPlayAd(_ player: Player) -> Bool
func player(_ player: Player, failedWith error: String)
}
Expand Down
13 changes: 9 additions & 4 deletions Classes/Player/PlayerConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,19 @@ public class MediaConfig: NSObject {
/// A `PluginConfig` object defines config to use when loading a plugin object.
public class PluginConfig: NSObject {
/// Plugins config dictionary holds [plugin name : plugin config]
@objc public var config: [String : AnyObject]?
@objc public var config: [String : Any]

public init(config: [String : AnyObject]) {
override public var description: String {
return "Plugin config:\n\(self.config)"
}

public init(config: [String : Any]) {
self.config = config
}

override public var description: String {
return "Plugin config:\n\(self.config)"
/// Private init.
private override init() {
fatalError("Private initializer, use `init(config:)`")
}
}

Expand Down
2 changes: 1 addition & 1 deletion Example/PlayKit/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1.9</string>
<string>0.1.x-dev</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
18 changes: 17 additions & 1 deletion Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
PODS:
- GoogleAds-IMA-iOS-SDK (3.3.1)
- Log (1.0)
<<<<<<< HEAD
- PlayKit (0.1.6):
- PlayKit/Core (= 0.1.6)
- PlayKit/Core (0.1.6):
Expand All @@ -10,6 +11,17 @@ PODS:
- PlayKit/IMAPlugin (0.1.6):
- PlayKit/Core
- PlayKit/YouboraPlugin (0.1.6):
=======
- PlayKit (0.1.x-dev):
- PlayKit/Core (= 0.1.x-dev)
- PlayKit/Core (0.1.x-dev):
- Log
- SwiftyJSON
- SwiftyXMLParser
- PlayKit/IMAPlugin (0.1.x-dev):
- PlayKit/Core
- PlayKit/YouboraPlugin (0.1.x-dev):
>>>>>>> 42862b9e5548da79fa7d65430872d3c4f2dfdbe2
- PlayKit/Core
- Youbora-AVPlayer/dynamic
- SwiftyJSON (3.1.4)
Expand All @@ -31,12 +43,16 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
GoogleAds-IMA-iOS-SDK: 5643300870bd3289c47c0d0b5a2dbf595b05c336
Log: 5e368c9528db07517d18d2d04ff5fe2b6f5a1e21
<<<<<<< HEAD
PlayKit: 7136982b3790bbd77d75830c9c571fc62a251431
=======
PlayKit: ba61459980c418ece6f00656aa1e78e4e3aeac57
>>>>>>> 42862b9e5548da79fa7d65430872d3c4f2dfdbe2
SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220
SwiftyXMLParser: 8d2295fb4fbc6e2ff241e7c8d7717e159be35969
Youbora-AVPlayer: 02aea2a12a4f7e6a61d8a1747e5dfc177bf2354b
Youbora-YouboraLib: 523adf7cd09c4a213e3485e6ec7c48d498986246

PODFILE CHECKSUM: d81c2fadcc5b7123880231eec45fd3940c2c04a8

COCOAPODS: 1.1.1
COCOAPODS: 1.2.0
9 changes: 8 additions & 1 deletion PlayKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'PlayKit'
s.version = '0.1.9'
s.version = '0.1.x-dev'
s.summary = 'PlayKit: Kaltura Mobile Player SDK - iOS'


Expand All @@ -21,9 +21,11 @@ end
s.subspec 'IMAPlugin' do |ssp|
ssp.source_files = 'Plugins/IMA'
ssp.xcconfig = { 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES',
'OTHER_LDFLAGS' => '$(inherited) -framework "GoogleInteractiveMediaAds"',
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}"/**',
'LIBRARY_SEARCH_PATHS' => '$(inherited) "${PODS_ROOT}"/**' }
ssp.dependency 'PlayKit/Core'
ssp.dependency 'GoogleAds-IMA-iOS-SDK', '3.4.1'
end

s.subspec 'GoogleCastAddon' do |ssp|
Expand All @@ -49,8 +51,13 @@ end
s.subspec 'WidevineClassic' do |ssp|
ssp.source_files = 'Widevine'
ssp.dependency 'PlayKit/Core'
<<<<<<< HEAD
ssp.dependency 'PlayKitWV'
ssp.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'GCC_PREPROCESSOR_DEFINITIONS'=>'WIDEVINE_ENABLED=1' }
=======
#ssp.dependency 'PlayKitWV'
#ssp.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'GCC_PREPROCESSOR_DEFINITIONS'=>'WIDEVINE_ENABLED=1' }
>>>>>>> 42862b9e5548da79fa7d65430872d3c4f2dfdbe2
end

s.subspec 'PhoenixPlugin' do |ssp|
Expand Down
29 changes: 0 additions & 29 deletions Plugins/IMA/IMAPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// Copyright © 2016 Google, Inc. All rights reserved.
//

#if IMA_ENABLED
import GoogleInteractiveMediaAds

public class IMAPlugin: NSObject, AVPictureInPictureControllerDelegate, PlayerDecoratorProvider, AdsPlugin, IMAAdsLoaderDelegate, IMAAdsManagerDelegate, IMAWebOpenerDelegate, IMAContentPlayhead {
Expand Down Expand Up @@ -477,31 +476,3 @@ public class IMAPlugin: NSObject, AVPictureInPictureControllerDelegate, PlayerDe
self.notify(event: AdEvent.AdWebOpenerDidCloseInAppBrowser(webOpener: webOpener))
}
}

#else
public class IMAPlugin: NSObject, PKPlugin {

public required init(player: Player, pluginConfig: Any?, messageBus: MessageBus) {

}

public func onLoad(mediaConfig: MediaConfig) {
PKLog.trace("plugin \(type(of:self)) onLoad with media config: \(mediaConfig)")
self.mediaEntry = mediaConfig.mediaEntry
}

public func onUpdateMedia(mediaConfig: MediaConfig) {
PKLog.trace("plugin \(type(of:self)) onUpdateMedia with media config: \(mediaConfig)")
self.mediaEntry = mediaConfig.mediaEntry
}

public var mediaEntry: MediaEntry?

public static var pluginName = String(describing: IMAPlugin.self)

public func destroy() {

}
}

#endif

0 comments on commit 1895aeb

Please sign in to comment.