Merge branch 'development' into feature/introduce-debugconfig

bitmovin · Nov 25, 2024 · 0b63086 · 0b63086
2 parents d1b0ed2 + a4deda1
commit 0b63086
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 23 deletions.
diff --git a/.github/workflows/create-sdk-update-pr.yml b/.github/workflows/create-sdk-update-pr.yml
@@ -82,6 +82,7 @@ jobs:
         if: ${{ inputs.sdk_name == 'android' }}
         run: |
           sed -i '' "s/com.bitmovin.player:player:.*/com.bitmovin.player:player:${{ inputs.version_number }}'/g" android/build.gradle
+          sed -i '' "s/com.bitmovin.player:player-media-session:.*/com.bitmovin.player:player-media-session:${{ inputs.version_number }}'/g" android/build.gradle
 
       - name: Commit version bump
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - `DebugConfig.isDebugLoggingEnabled` and `DebugConfig.setDebugLoggingEnabled(value: boolean)` to check and set whether debug logging is enabled. Debug logging helps diagnose problems and trace the flow of execution within the Player and **should not be enabled in production** as it may log sensitive or confidential information to the console.
 
+### Changed
+
+- Update Bitmovin's native iOS SDK version to `3.78.0`
+
 ## [0.32.0] - 2024-11-14
 
 ### Added

diff --git a/RNBitmovinPlayer.podspec b/RNBitmovinPlayer.podspec
@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = "5.10"
   s.dependency "React-Core"
-  s.dependency "BitmovinPlayer", "3.77.0"
+  s.dependency "BitmovinPlayer", "3.78.0"
   s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.23.0"
   s.tvos.dependency "GoogleAds-IMA-tvOS-SDK", "4.13.0"
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -3,10 +3,10 @@ PODS:
     - BitmovinAnalyticsCollector/Core
     - BitmovinPlayerCore (~> 3.48)
   - BitmovinAnalyticsCollector/Core (3.9.0)
-  - BitmovinPlayer (3.77.0):
+  - BitmovinPlayer (3.78.0):
     - BitmovinAnalyticsCollector/BitmovinPlayer (~> 3.0)
-    - BitmovinPlayerCore (= 3.77.0)
-  - BitmovinPlayerCore (3.77.0)
+    - BitmovinPlayerCore (= 3.78.0)
+  - BitmovinPlayerCore (3.78.0)
   - boost (1.83.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.73.4-0)
@@ -1049,7 +1049,7 @@ PODS:
     - React-logger (= 0.73.4-0)
     - React-perflogger (= 0.73.4-0)
   - RNBitmovinPlayer (0.32.0):
-    - BitmovinPlayer (= 3.77.0)
+    - BitmovinPlayer (= 3.78.0)
     - GoogleAds-IMA-iOS-SDK (= 3.23.0)
     - GoogleAds-IMA-tvOS-SDK (= 4.13.0)
     - React-Core
@@ -1245,8 +1245,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BitmovinAnalyticsCollector: d08e0b13bcc32973370e0d71f2faa739561bac0a
-  BitmovinPlayer: 65866e13f7a8246ccbc7378607d6ca789f0f459e
-  BitmovinPlayerCore: 158b4a5b81b12b819f0f51b7b89711ca47e11583
+  BitmovinPlayer: 7fc1bf0b32c540537c05664c7b60a559f1e47206
+  BitmovinPlayerCore: 37cc7a3299af139f19a0e2e88c1f476821242cb0
   boost: 88202336c3ba1e7a264a83c0c888784b0f360c28
   DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a
   FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba
@@ -1301,12 +1301,12 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8
   React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74
   ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2
-  RNBitmovinPlayer: b05649d62740361dd1d1030ce5926e49b4a471eb
+  RNBitmovinPlayer: 4078b6c4f222f09ca147ed5c51a5fa4a2fa21863
   RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
   RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000
 
 PODFILE CHECKSUM: 11ac6cb62c1978622f6d687b574d9de3441a2680
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.15.2
diff --git a/example/yarn.lock b/example/yarn.lock
@@ -2266,9 +2266,9 @@ cosmiconfig@^5.0.5, cosmiconfig@^5.1.0:
     parse-json "^4.0.0"
 
 cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

diff --git a/integration_test/ios/Podfile.lock b/integration_test/ios/Podfile.lock
@@ -3,10 +3,10 @@ PODS:
     - BitmovinAnalyticsCollector/Core
     - BitmovinPlayerCore (~> 3.48)
   - BitmovinAnalyticsCollector/Core (3.9.0)
-  - BitmovinPlayer (3.77.0):
+  - BitmovinPlayer (3.78.0):
     - BitmovinAnalyticsCollector/BitmovinPlayer (~> 3.0)
-    - BitmovinPlayerCore (= 3.77.0)
-  - BitmovinPlayerCore (3.77.0)
+    - BitmovinPlayerCore (= 3.78.0)
+  - BitmovinPlayerCore (3.78.0)
   - boost (1.83.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.73.4-0)
@@ -1041,7 +1041,7 @@ PODS:
     - React-logger (= 0.73.4-0)
     - React-perflogger (= 0.73.4-0)
   - RNBitmovinPlayer (0.32.0):
-    - BitmovinPlayer (= 3.77.0)
+    - BitmovinPlayer (= 3.78.0)
     - GoogleAds-IMA-iOS-SDK (= 3.23.0)
     - GoogleAds-IMA-tvOS-SDK (= 4.13.0)
     - React-Core
@@ -1215,8 +1215,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BitmovinAnalyticsCollector: d08e0b13bcc32973370e0d71f2faa739561bac0a
-  BitmovinPlayer: 65866e13f7a8246ccbc7378607d6ca789f0f459e
-  BitmovinPlayerCore: 158b4a5b81b12b819f0f51b7b89711ca47e11583
+  BitmovinPlayer: 7fc1bf0b32c540537c05664c7b60a559f1e47206
+  BitmovinPlayerCore: 37cc7a3299af139f19a0e2e88c1f476821242cb0
   boost: 88202336c3ba1e7a264a83c0c888784b0f360c28
   DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a
   FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba
@@ -1266,10 +1266,10 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8
   React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74
   ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2
-  RNBitmovinPlayer: b05649d62740361dd1d1030ce5926e49b4a471eb
+  RNBitmovinPlayer: 4078b6c4f222f09ca147ed5c51a5fa4a2fa21863
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000
 
 PODFILE CHECKSUM: d1cd0316ec7219d421f4dfb46ced3af29fd4e932
 
-COCOAPODS: 1.16.2
+COCOAPODS: 1.15.2
diff --git a/integration_test/yarn.lock b/integration_test/yarn.lock
@@ -2252,9 +2252,9 @@ cosmiconfig@^5.0.5, cosmiconfig@^5.1.0:
     parse-json "^4.0.0"
 
 cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

diff --git a/ios/FullscreenHandlerModule.swift b/ios/FullscreenHandlerModule.swift
@@ -44,19 +44,22 @@ public class FullscreenHandlerModule: NSObject, RCTBridgeModule {
         fullscreenHandlers.removeValue(forKey: nativeId)
     }
 
+    @MainActor
     @objc(onFullscreenChanged:isFullscreenEnabled:)
     func onFullscreenChanged(_ nativeId: NativeId, isFullscreenEnabled: Bool) -> Any? {
         fullscreenHandlers[nativeId]?.isFullscreen = isFullscreenEnabled
         fullscreenChangeDispatchGroup.leave()
         return nil
     }
 
+    @MainActor
     @objc(registerHandler:)
     func registerHandler(_ nativeId: NativeId) {
         guard fullscreenHandlers[nativeId] == nil else { return }
         fullscreenHandlers[nativeId] = FullscreenHandlerBridge(nativeId, bridge: bridge)
     }
 
+    @MainActor
     @objc(setIsFullscreenActive:isFullscreen:)
     func setIsFullscreenActive(_ nativeId: NativeId, isFullscreen: Bool) {
         fullscreenHandlers[nativeId]?.isFullscreen = isFullscreen

diff --git a/ios/RNPlayerViewManager.swift b/ios/RNPlayerViewManager.swift
@@ -200,6 +200,7 @@ public class RNPlayerViewManager: RCTViewManager {
         bridge.module(for: FullscreenHandlerModule.self) as? FullscreenHandlerModule
     }
 
+    @MainActor
     private func maybeEmitPictureInPictureAvailabilityEvent(for view: RNPlayerView, previousState: Bool) {
         guard let playerView = view.playerView,
               playerView.isPictureInPictureAvailable != previousState else {