Merge pull request #113 from THEOplayer/maintenance/adopt-v11-changes

Maintenance/adopt v11 changes

Author: therama

Code/Conviva/Source/Base/Events/ConvivaHandlers/AdHandler.swift

@@ -223,7 +223,7 @@ extension Ad {
         result["c3.ad.firstCreativeId"] = nonEmpty(googleImaAd?.wrapperCreativeIds.first) ?? nonEmpty(googleImaAd?.creativeId) ?? Utilities.defaultStringValue
         result["c3.ad.firstAdSystem"] = nonEmpty(googleImaAd?.wrapperAdSystems.first) ?? nonEmpty(googleImaAd?.adSystem) ?? Utilities.defaultStringValue
         result["c3.ad.adStitcher"] = Utilities.defaultStringValue
-        result["c3.ad.position"] = self.adBreak.calculateCurrentAdBreakPosition()
+        result["c3.ad.position"] = self.adBreak?.calculateCurrentAdBreakPosition() ?? Utilities.defaultStringValue
         // linearAd specific
         if self.type == THEOplayerSDK.AdType.linear, let duration = self.duration {
             result[CIS_SSDK_METADATA_IS_LIVE] = false

Code/Conviva/Source/Base/Events/Observers/AdEventForwarder.swift

@@ -27,8 +27,8 @@ struct AdEventForwarder {
             player.addRemovableEventListener(type: PlayerEventTypes.PLAYING, listener: filter.conditionalSender(handler.adPlaying)),
             player.addRemovableEventListener(type: PlayerEventTypes.TIME_UPDATE) {
                 filter.conditionalSender(handler.adTimeUpdate)($0.currentTimeInMilliseconds)
-                filter.conditionalSender(handler.adRenderedFramerateUpdate)(NSNumber(value: Int(player.playerMetrics.renderedFramerate.rounded())))
-                filter.conditionalSender(handler.adDroppedFramesUpdate)(NSNumber(value: player.playerMetrics.droppedVideoFrames))
+                filter.conditionalSender(handler.adRenderedFramerateUpdate)(NSNumber(value: Int(player.metrics.renderedFramerate.rounded())))
+                filter.conditionalSender(handler.adDroppedFramesUpdate)(NSNumber(value: player.metrics.droppedVideoFrames))
             },
             player.addRemovableEventListener(type: PlayerEventTypes.PAUSE, listener: filter.conditionalSender(handler.adPause))
         ]

Code/Conviva/Source/Base/Events/Observers/AppEventForwarder.swift

@@ -9,10 +9,6 @@ import THEOplayerConnectorUtilities
 
 fileprivate let willEnterForeground = UIApplication.willEnterForegroundNotification
 fileprivate let didEnterBackground = UIApplication.didEnterBackgroundNotification
-// Xcode 15 (Swift 5.9) introduces (and only fires notification with) `AVPlayerItem.newAccessLogEntryNotification`, and deprecates `Notification.Name.AVPlayerItemNewAccessLogEntry` (doesn't fire notification anymore)
-// Older Xcode and Swift versions only fire notification with `Notification.Name.AVPlayerItemNewAccessLogEntry`
-// Both `AVPlayerItem.newAccessLogEntryNotification` and `Notification.Name.AVPlayerItemNewAccessLogEntry` are mapped to `Notification.Name("AVPlayerItemNewAccessLogEntry")`, hence we use that.
-// Once we drop support for older versions (below Xcode 15 and Swift 5.9) we can switch from `Notification.Name("AVPlayerItemNewAccessLogEntry")` to `AVPlayerItem.newAccessLogEntryNotification`.
 
 class AppEventForwarder {
     private let center = NotificationCenter.default

Code/Conviva/Source/Base/Events/Observers/PlayerEventForwarder.swift

@@ -45,8 +45,8 @@ class PlayerEventForwarder {
             player.addRemovableEventListener(type: PlayerEventTypes.TIME_UPDATE) {
                 handler.timeUpdate(
                     currentTimeInMilliseconds: $0.currentTimeInMilliseconds,
-                    renderedFramerate: NSNumber(value: Int(player.playerMetrics.renderedFramerate.rounded())),
-                    droppedFrames: NSNumber(value: player.playerMetrics.droppedVideoFrames)
+                    renderedFramerate: NSNumber(value: Int(player.metrics.renderedFramerate.rounded())),
+                    droppedFrames: NSNumber(value: player.metrics.droppedVideoFrames)
                 )
             },
             player.addRemovableEventListener(type: PlayerEventTypes.SOURCE_CHANGE) {

Code/Nielsen/Source/Events/NielsenReporter/AdEventReporter.swift

@@ -25,7 +25,7 @@ public class AdEventReporter: AdEventProcessor {
         nielsen.stop()
         nielsen.loadMetadata(
             [
-                "type": ad.adBreak.nielsenType,
+                "type": ad.adBreak?.nielsenType,
                 "assetid": ad.id
             ]
         )

Package.swift

@@ -22,7 +22,7 @@ let package = Package(
     ],
     dependencies: [
         .package(name: "ConvivaSDK", url: "https://github.com/Conviva/conviva-ios-sdk-spm", .exactItem( "4.0.51")),
-        .package(name: "THEOplayerSDK", url: "https://github.com/THEOplayer/theoplayer-sdk-apple", from: "10.0.0"),
+        .package(name: "THEOplayerSDK", url: "https://github.com/THEOplayer/theoplayer-sdk-apple", from: "11.0.0"),
         .package(name: "NielsenAppApi", url: "https://github.com/NielsenDigitalSDK/nielsenappsdk-ios-dynamic-spm-global", from: "9.0.0"),
         .package(name: "Swifter", url: "https://github.com/httpswift/swifter.git", .exactItem("1.5.0")),
         .package(name: "SwiftSubtitles", url: "https://github.com/dagronf/SwiftSubtitles.git", .exactItem("0.9.1")),

THEOplayer-Connector-Comscore.podspec

@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
   s.static_framework = true
   s.swift_versions = ['5.3', '5.4', '5.5', '5.6', '5.7']
-  s.dependency 'THEOplayerSDK-core', "~> 10"
+  s.dependency 'THEOplayerSDK-core', "~> 11"
   s.dependency 'ComScore', '~> 6.10.0'
 end

THEOplayer-Connector-Conviva.podspec

@@ -22,15 +22,15 @@ Pod::Spec.new do |s|
   s.subspec 'Base' do |base|
     base.source_files = 'Code/Conviva/Source/Base/**/*'
     base.dependency 'ConvivaSDK', '4.2.4'
-    base.dependency 'THEOplayerSDK-core', "~> 10.2"
+    base.dependency 'THEOplayerSDK-core', "~> 11"
     base.dependency 'THEOplayer-Connector-Utilities', "~> " + theoplayer_connector_major_minor_version, ">= " + theoplayer_connector_version
   end
 
   # --- Subspec: THEOlive (+THEOlive Conviva) ---
   s.subspec 'THEOlive' do |live|
     live.source_files = 'Code/Conviva/Source/THEOlive/**/*'
     live.dependency "#{s.name}/Base"
-    live.dependency 'THEOplayer-Integration-THEOlive', "~> 10.2"
+    live.dependency 'THEOplayer-Integration-THEOlive', "~> 11"
   end
 
   # Default

THEOplayer-Connector-Nielsen.podspec

@@ -20,6 +20,6 @@ Pod::Spec.new do |s|
   s.static_framework = true
   s.swift_versions = ['5.3', '5.4', '5.5', '5.6', '5.7']
   s.dependency 'NielsenAppSDK-XC', "~> 10"
-  s.dependency 'THEOplayerSDK-core', "~> 10"
+  s.dependency 'THEOplayerSDK-core', "~> 11"
   s.dependency 'THEOplayer-Connector-Utilities', "~> " + theoplayer_connector_major_minor_version, ">= " + theoplayer_connector_version
 end

THEOplayer-Connector-SideloadedSubtitle.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
 
   s.static_framework = true
   s.swift_versions = ['5.3', '5.4', '5.5', '5.6', '5.7']
-  s.dependency 'THEOplayerSDK-core', "~> 10.7"
+  s.dependency 'THEOplayerSDK-core', "~> 11"
   s.dependency 'SwiftSubtitles', '0.9.1'
   s.dependency 'Swifter', '1.5.0'
 end