From 9489bfb9663faadf7c20951e50b64286497e2de1 Mon Sep 17 00:00:00 2001 From: Damiaan Dufaux Date: Wed, 19 Oct 2022 13:22:33 +0200 Subject: [PATCH] Avoid naming conflicts --- .../Source/ConvivaConnectorVerizonMedia+objc.swift | 2 +- Code/Conviva/Source/objc/ConvivaConfiguration+objc.swift | 4 ++-- Code/Conviva/Source/objc/ConvivaConnector+objc.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/Conviva-VerizonMedia/Source/ConvivaConnectorVerizonMedia+objc.swift b/Code/Conviva-VerizonMedia/Source/ConvivaConnectorVerizonMedia+objc.swift index cd1cf04..c57e15a 100644 --- a/Code/Conviva-VerizonMedia/Source/ConvivaConnectorVerizonMedia+objc.swift +++ b/Code/Conviva-VerizonMedia/Source/ConvivaConnectorVerizonMedia+objc.swift @@ -16,7 +16,7 @@ import THEOplayerSDK internalConnector = conviva } - @objc public convenience init?(configuration: THEOplayerConvivaConfiguration, player: THEOplayer) { + @objc public convenience init?(configuration: THEOplayerConnectorConvivaConfiguration, player: THEOplayer) { guard let endpoints = ConvivaEndpoints(configuration: configuration) else { return nil } let base = ConvivaConnector(conviva: endpoints, player: player) self.init(conviva: ConvivaConnectorVerizonMedia(base: base)) diff --git a/Code/Conviva/Source/objc/ConvivaConfiguration+objc.swift b/Code/Conviva/Source/objc/ConvivaConfiguration+objc.swift index 98f4aa4..714d1c9 100644 --- a/Code/Conviva/Source/objc/ConvivaConfiguration+objc.swift +++ b/Code/Conviva/Source/objc/ConvivaConfiguration+objc.swift @@ -8,7 +8,7 @@ import ConvivaSDK /// Settings that specify how to communicate with the Conviva backend -@objc public class THEOplayerConvivaConfiguration: NSObject { +@objc public class THEOplayerConnectorConvivaConfiguration: NSObject { let internalConfig: ConvivaConfiguration /// Creates an objc class that contains settings to connect to conviva @@ -22,7 +22,7 @@ import ConvivaSDK } extension ConvivaEndpoints { - public convenience init?(configuration: THEOplayerConvivaConfiguration) { + public convenience init?(configuration: THEOplayerConnectorConvivaConfiguration) { self.init(configuration: configuration.internalConfig) } } diff --git a/Code/Conviva/Source/objc/ConvivaConnector+objc.swift b/Code/Conviva/Source/objc/ConvivaConnector+objc.swift index d76d8db..225699b 100644 --- a/Code/Conviva/Source/objc/ConvivaConnector+objc.swift +++ b/Code/Conviva/Source/objc/ConvivaConnector+objc.swift @@ -5,7 +5,7 @@ import ConvivaSDK @objc public class THEOplayerConvivaConnector: NSObject { let internalConnector: ConvivaConnector - @objc public convenience init?(configuration: THEOplayerConvivaConfiguration, player: THEOplayer) { + @objc public convenience init?(configuration: THEOplayerConnectorConvivaConfiguration, player: THEOplayer) { guard let endpoints = ConvivaEndpoints(configuration: configuration) else { return nil } self.init(conviva: endpoints, player: player) }