Merge pull request #56 from THEOplayer/prepare-8.0

Prepare 8.0
THEOplayer · Sep 6, 2024 · aa720f4 · aa720f4
2 parents 6cdc201 + a5da699
commit aa720f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml
@@ -83,7 +83,7 @@ jobs:
                   continue
                 fi
                 # blacklisted podspecs
-                if [[ $file == *VerizonMedia.podspec || $file == *Nielsen.podspec ]]; then
+                if [[ $file == *VerizonMedia.podspec || $file == *Nielsen.podspec || $file == *Yospace.podspec ]]; then
                   continue
                 fi
                 # Conviva validation depends on Utilities being available, which does not get published in a dry run

diff --git a/Code/Conviva/Source/Events/ConvivaReporters/AdEventConvivaReporter.swift b/Code/Conviva/Source/Events/ConvivaReporters/AdEventConvivaReporter.swift
@@ -153,7 +153,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() ?? "Pre-roll"
+        result["c3.ad.position"] = self.adBreak.calculateCurrentAdBreakPosition()
         // linearAd specific
         if let linearAd = self as? LinearAd,
            let duration = linearAd.duration {

diff --git a/Code/Nielsen/Source/Events/NielsenReporter/AdEventReporter.swift b/Code/Nielsen/Source/Events/NielsenReporter/AdEventReporter.swift
@@ -20,11 +20,11 @@ public class AdEventReporter: AdEventProcessor {
     }
 
     public func adBegin(event: AdBeginEvent) {
-        guard let ad = event.ad, let adBreak = ad.adBreak, event.ad?.type == THEOplayerSDK.AdType.linear else { return }
+        guard let ad = event.ad, event.ad?.type == THEOplayerSDK.AdType.linear else { return }
         nielsen.stop()
         nielsen.loadMetadata(
             [
-                "type": adBreak.nielsenType,
+                "type": ad.adBreak.nielsenType,
                 "assetid": ad.id
             ]
         )