From 564cf7efa18fd2685d85a220192e261e250cbf2c Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Thu, 12 Dec 2024 16:05:58 +0100 Subject: [PATCH 1/4] fix build issues with newer SDK versions --- BitmovinConvivaAnalytics/Classes/ConvivaAnalytics.swift | 6 ++++-- Example/Tests/Doubles/BitmovinPlayerTestDouble.swift | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/BitmovinConvivaAnalytics/Classes/ConvivaAnalytics.swift b/BitmovinConvivaAnalytics/Classes/ConvivaAnalytics.swift index 9c3eaee..886ac1b 100644 --- a/BitmovinConvivaAnalytics/Classes/ConvivaAnalytics.swift +++ b/BitmovinConvivaAnalytics/Classes/ConvivaAnalytics.swift @@ -44,8 +44,10 @@ public final class ConvivaAnalytics: NSObject { */ public var playerView: PlayerView? { didSet { - oldValue?.remove(listener: self) - playerView?.add(listener: self) + Task { @MainActor in + oldValue?.remove(listener: self) + playerView?.add(listener: self) + } } } diff --git a/Example/Tests/Doubles/BitmovinPlayerTestDouble.swift b/Example/Tests/Doubles/BitmovinPlayerTestDouble.swift index 3e990d7..b37809f 100644 --- a/Example/Tests/Doubles/BitmovinPlayerTestDouble.swift +++ b/Example/Tests/Doubles/BitmovinPlayerTestDouble.swift @@ -442,6 +442,15 @@ class BitmovinPlayerStub: NSObject, Player { player.isAirPlayAvailable } + var allowsAirPlay: Bool { + get { + player.allowsAirPlay + } + set { + player.allowsAirPlay = newValue + } + } + var availableVideoQualities: [VideoQuality] { player.availableVideoQualities } From dcbd65633ba9decffb8ac92b0a10b5a1d257f549 Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Thu, 12 Dec 2024 16:13:05 +0100 Subject: [PATCH 2/4] update Player SDK version in Example application --- CHANGELOG.md | 5 +++++ Example/Podfile | 2 +- Example/Podfile.lock | 23 +++++++++++------------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e23e910..e89413c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] + +### Changed +- Updated the Bitmovin Player version used in the Example application to 3.79.0 + ## [3.4.1] - 2024-08-26 ### Fixed diff --git a/Example/Podfile b/Example/Podfile index 5b453bc..ff24a11 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -3,7 +3,7 @@ source 'https://cdn.cocoapods.org/' def shared_pods pod 'BitmovinConvivaAnalytics', path: '../' - pod 'BitmovinPlayer', '3.64.0' + pod 'BitmovinPlayer', '3.79.0' pod 'ConvivaSDK', '4.0.49' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index b7bf405..d5260ba 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,15 +1,15 @@ PODS: - - BitmovinAnalyticsCollector/BitmovinPlayer (3.7.0): + - BitmovinAnalyticsCollector/BitmovinPlayer (3.9.0): - BitmovinAnalyticsCollector/Core - BitmovinPlayerCore (~> 3.48) - - BitmovinAnalyticsCollector/Core (3.7.0) + - BitmovinAnalyticsCollector/Core (3.9.0) - BitmovinConvivaAnalytics (3.4.1): - BitmovinPlayer (~> 3.64) - ConvivaSDK (~> 4.0) - - BitmovinPlayer (3.64.0): + - BitmovinPlayer (3.79.0): - BitmovinAnalyticsCollector/BitmovinPlayer (~> 3.0) - - BitmovinPlayerCore (= 3.64.0) - - BitmovinPlayerCore (3.64.0) + - BitmovinPlayerCore (= 3.79.0) + - BitmovinPlayerCore (3.79.0) - ConvivaSDK (4.0.49) - CwlCatchException (2.2.0): - CwlCatchExceptionSupport (~> 2.2.0) @@ -28,7 +28,7 @@ PODS: DEPENDENCIES: - BitmovinConvivaAnalytics (from `../`) - - BitmovinPlayer (= 3.64.0) + - BitmovinPlayer (= 3.79.0) - ConvivaSDK (= 4.0.49) - GoogleAds-IMA-iOS-SDK (= 3.22.1) - GoogleAds-IMA-tvOS-SDK (= 4.12.0) @@ -36,11 +36,10 @@ DEPENDENCIES: - Quick (~> 7.5.0) SPEC REPOS: - https://github.com/bitmovin/cocoapod-specs.git: + trunk: - BitmovinAnalyticsCollector - BitmovinPlayer - BitmovinPlayerCore - trunk: - ConvivaSDK - CwlCatchException - CwlCatchExceptionSupport @@ -57,10 +56,10 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - BitmovinAnalyticsCollector: bbd82c0b8e11aefacd8e53b6e40c62f2cba6f3f5 + BitmovinAnalyticsCollector: d08e0b13bcc32973370e0d71f2faa739561bac0a BitmovinConvivaAnalytics: 88938e0b343392c4036b122e635b47745dd8af80 - BitmovinPlayer: f69350e5db2f57ad950108ec829b7c7a4b360d00 - BitmovinPlayerCore: 1553570729eed0a64cdfbd06d16c39d69d7e701f + BitmovinPlayer: 1c19b819952c2c10c875569756593f2e177cf036 + BitmovinPlayerCore: 299f35f2d8882140a80577c14bd3026beb0cae7c ConvivaSDK: 5d10811e8611ed1fd99a5ab291bdcb1e795f8756 CwlCatchException: 51bf8319009a31104ea6f0568730d1ecc25b6454 CwlCatchExceptionSupport: 1345d6adb01a505933f2bc972dab60dcb9ce3e50 @@ -72,6 +71,6 @@ SPEC CHECKSUMS: Nimble: 3ac6c6b0b7e9835d1540b6507d8054b12a415536 Quick: 2b651168441479b949ba987f3cee41a9cc53aa32 -PODFILE CHECKSUM: 7c46997cf928147ddff32915a3194ff8947b03e2 +PODFILE CHECKSUM: 3604f8e81142c31edfa76597d16f64d2d56ac541 COCOAPODS: 1.15.2 From 258f88005afdcb59baefda82d14d7b36144b014f Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Thu, 12 Dec 2024 16:41:03 +0100 Subject: [PATCH 3/4] add fixed changelog item --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e89413c..cd8d309 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Fixed +- Build error when using Bitmovin Player version 3.78.0 or newer + ### Changed - Updated the Bitmovin Player version used in the Example application to 3.79.0 From 886f9a23902f00cc3fe4659f74822d2712dd60a7 Mon Sep 17 00:00:00 2001 From: Daniel Weinberger Date: Fri, 13 Dec 2024 09:34:24 +0100 Subject: [PATCH 4/4] Bump version --- BitmovinConvivaAnalytics.podspec | 2 +- BitmovinConvivaAnalytics/Assets/BitmovinConviva-Info.plist | 2 +- CHANGELOG.md | 2 ++ Example/Podfile.lock | 4 ++-- README.md | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BitmovinConvivaAnalytics.podspec b/BitmovinConvivaAnalytics.podspec index c15f268..d616bd0 100644 --- a/BitmovinConvivaAnalytics.podspec +++ b/BitmovinConvivaAnalytics.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'BitmovinConvivaAnalytics' - s.version = '3.4.1' + s.version = '3.5.0' s.summary = 'Conviva Analytics Integration for the Bitmovin Player iOS SDK' s.description = <<-DESC diff --git a/BitmovinConvivaAnalytics/Assets/BitmovinConviva-Info.plist b/BitmovinConvivaAnalytics/Assets/BitmovinConviva-Info.plist index b7a0991..515f052 100644 --- a/BitmovinConvivaAnalytics/Assets/BitmovinConviva-Info.plist +++ b/BitmovinConvivaAnalytics/Assets/BitmovinConviva-Info.plist @@ -3,6 +3,6 @@ CFBundleShortVersionString - 3.4.1 + 3.5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index cd8d309..1bd4deb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## [3.5.0] - 2024-12-13 + ### Fixed - Build error when using Bitmovin Player version 3.78.0 or newer diff --git a/Example/Podfile.lock b/Example/Podfile.lock index d5260ba..d795dbe 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -3,7 +3,7 @@ PODS: - BitmovinAnalyticsCollector/Core - BitmovinPlayerCore (~> 3.48) - BitmovinAnalyticsCollector/Core (3.9.0) - - BitmovinConvivaAnalytics (3.4.1): + - BitmovinConvivaAnalytics (3.5.0): - BitmovinPlayer (~> 3.64) - ConvivaSDK (~> 4.0) - BitmovinPlayer (3.79.0): @@ -57,7 +57,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BitmovinAnalyticsCollector: d08e0b13bcc32973370e0d71f2faa739561bac0a - BitmovinConvivaAnalytics: 88938e0b343392c4036b122e635b47745dd8af80 + BitmovinConvivaAnalytics: 65852b604f811ce7d73999bac3a1071f4f293a41 BitmovinPlayer: 1c19b819952c2c10c875569756593f2e177cf036 BitmovinPlayerCore: 299f35f2d8882140a80577c14bd3026beb0cae7c ConvivaSDK: 5d10811e8611ed1fd99a5ab291bdcb1e795f8756 diff --git a/README.md b/README.md index d94dc34..edc28f3 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ BitmovinConvivaAnalytics is available through [CocoaPods](https://cocoapods.org) To install it, simply add the following line to your Podfile: ```ruby -pod 'BitmovinConvivaAnalytics', git: 'https://github.com/bitmovin/bitmovin-player-ios-analytics-conviva.git', tag: '3.4.1' +pod 'BitmovinConvivaAnalytics', git: 'https://github.com/bitmovin/bitmovin-player-ios-analytics-conviva.git', tag: '3.5.0' ``` Then, in your command line run: