Merge branch 'development' into upgrade_react_native

# Conflicts: # example/ios/Podfile.lock # integration_test/ios/Podfile.lock
bitmovin · Mar 1, 2024 · 54e2805 · 54e2805
2 parents 1d645a7 + 6909f30
commit 54e2805
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 33 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+.github/ @bitmovin/player-ios @bitmovin/player-android
+ios/ @bitmovin/player-ios
+example/ios/ @bitmovin/player-ios
+android/ @bitmovin/player-android
+example/android/ @bitmovin/player-android
diff --git a/.github/workflows/ci-ios-tvos.yml b/.github/workflows/ci-ios-tvos.yml
@@ -38,14 +38,14 @@ env:
 jobs:
   code-style-ios:
     name: Code style iOS
-    runs-on: macOS-latest
+    runs-on: macOS-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '14.2'
+          xcode-version: '14.3'
 
       - name: Install dependencies
         run: brew bundle install
@@ -55,7 +55,7 @@ jobs:
 
   test-build-ios:
     name: Build iOS
-    runs-on: macOS-12
+    runs-on: macOS-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '14.2'
+          xcode-version: '14.3'
 
       - name: Install node_modules
         run: yarn install --frozen-lockfile
@@ -125,7 +125,7 @@ jobs:
 
   test-build-tvos:
     name: Build tvOS
-    runs-on: macOS-12
+    runs-on: macOS-14
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -139,7 +139,7 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '14.2'
+          xcode-version: '14.3'
 
       - name: Install node_modules
         run: yarn install --frozen-lockfile

diff --git a/.github/workflows/create-sdk-update-pr.yml b/.github/workflows/create-sdk-update-pr.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   update:
     name: Update SDK version
-    runs-on: macos-latest
+    runs-on: macos-14
     env:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
     steps:

diff --git a/.github/workflows/start-release-train.yml b/.github/workflows/start-release-train.yml
@@ -21,7 +21,7 @@ concurrency:
 jobs:
   create_release_pr:
     name: Create release branch and bump version
-    runs-on: macos-latest
+    runs-on: macos-14
     outputs:
       branch_name: ${{ steps.branching.outputs.branch_name }}
     steps:

diff --git a/README.md b/README.md
@@ -48,6 +48,7 @@ Check out our [React Native Guides](https://developer.bitmovin.com/playback/docs
 ### Sample Application
 
 In the [/example/](https://github.com/bitmovin/bitmovin-player-react-native/tree/development/example) folder you can find a sample application showcasing many of the features of the Player React Native SDK.
+See the related [README.md](https://github.com/bitmovin/bitmovin-player-react-native/tree/development/example/README.md) for more information on how to get started with the sample application.
 
 ## Maintenance and Updates
 

diff --git a/RNBitmovinPlayer.podspec b/RNBitmovinPlayer.podspec
@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "BitmovinPlayer", "3.55.0"
+  s.dependency "BitmovinPlayer", "3.56.2"
   s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.18.4"
   s.tvos.dependency "GoogleAds-IMA-tvOS-SDK", "4.8.2"
 end
diff --git a/example/README.md b/example/README.md
@@ -1,6 +1,6 @@
-# Example
+# Example Application
 
-This is a React Native app built to showcase the features of `bitmovin-player-react-native`. The code for all feature samples is contained
+This is a React Native application built to showcase the features of `bitmovin-player-react-native`. The code for all feature samples is contained
 inside the [`src/screens/`](https://github.com/bitmovin/bitmovin-player-react-native/tree/development/example/src/screens) directory:
 
 - [Basic playback](https://github.com/bitmovin/bitmovin-player-react-native/blob/development/example/src/screens/BasicPlayback.tsx)
@@ -24,16 +24,16 @@ To play back a custom video asset, it is possible to set up a simple playback se
 
 ## Getting started
 
-To get started with the project, run `yarn bootstrap` in the lib's root directory (not `example/`). This will install dependencies for both the library and the example app (as well as native deps too):
+To get started with the project, run `yarn bootstrap` in the library's root directory (not `example/`). This will install dependencies for both the library and the example application (as well as native dependencies):
 
 ```sh
-cd bitmovin-player-react-native # Go to lib's root directory
+cd bitmovin-player-react-native # Go to library's root directory
 yarn bootstrap # Install all dependencies
 ```
 
 ## Configuring your license key
 
-Before running the app, make sure to set up your Bitmovin's license key in the native metadata file of each platform:
+Before running the application, make sure to set up your Bitmovin's license key in the native metadata file of each platform:
 
 **iOS**
 
@@ -63,15 +63,29 @@ const player = usePlayer({
 });
 ```
 
-## Running the app
+### Add the Package Name and Bundle Identifiers as an Allowed Domain
 
-First start the metro bundler by running the following command on the lib's root (always execute `yarn` from the lib's root):
+Add the following package names and bundle identifiers of the example applications ending as an allowed domain on [https://bitmovin.com/dashboard](https://bitmovin.com/dashboard), under `Player -> Licenses` and also under `Analytics -> Licenses`.
 
-```sh
-yarn example start # Starts bundler on the example folder
+#### Android example application Package Name
+
+```
+com.bitmovin.player.reactnative.example
+```
+
+#### iOS example application Bundle Identifier
+
+```
+com.bitmovin.PlayerReactNative-Example
 ```
 
-Then run it via terminal or an IDE (Xcode/Android Studio):
+#### tvOS example application Bundle Identifier
+
+```
+com.bitmovin.PlayerReactNativeExample-tvOS
+```
+
+## Running the application
 
 **Terminal**
 
@@ -89,3 +103,13 @@ yarn example ios --simulator="iPhone 14 Pro"
 **IDE**
 
 You can also open the iOS project using Xcode by typing `xed example/ios/` on terminal, or `studio example/android/` to open the android project in Android Studio (make sure to setup its binaries first).
+
+### Running the bundler only
+
+The bundler is automatically started when running `yarn example android` or `yarn example ios` or when running via the IDEs, but it can also be started separately.
+
+To start the metro bundler, run the following command on the library's root (always execute `yarn` from the library's root):
+
+```sh
+yarn example start # Starts bundler on the example folder
+```
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.6.0)
-  - BitmovinPlayer (3.55.0):
+  - BitmovinPlayer (3.56.2):
     - BitmovinAnalyticsCollector/BitmovinPlayer (~> 3.0)
-    - BitmovinPlayerCore (= 3.55.0)
-  - BitmovinPlayerCore (3.55.0)
+    - BitmovinPlayerCore (= 3.56.2)
+  - BitmovinPlayerCore (3.56.2)
   - boost (1.83.0)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.73.4-0)
@@ -1052,7 +1052,7 @@ PODS:
     - React-logger (= 0.73.4-0)
     - React-perflogger (= 0.73.4-0)
   - RNBitmovinPlayer (0.17.0):
-    - BitmovinPlayer (= 3.55.0)
+    - BitmovinPlayer (= 3.56.2)
     - GoogleAds-IMA-iOS-SDK (= 3.18.4)
     - GoogleAds-IMA-tvOS-SDK (= 4.8.2)
     - React-Core
@@ -1249,8 +1249,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BitmovinAnalyticsCollector: 70f10cfc67f7e4bf38daddf4362f54bd6125683d
-  BitmovinPlayer: 4c42de316c9f56552fcde5cf20701329f55cc0db
-  BitmovinPlayerCore: 6699939e9c37b6047c3afc224245f01c60089ead
+  BitmovinPlayer: d90e291619495dafd0708d7e228bac687a8f7add
+  BitmovinPlayerCore: a1c24e70af1417ccc20c780d938ad116305d685e
   boost: 88202336c3ba1e7a264a83c0c888784b0f360c28
   DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a
   FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba
@@ -1305,7 +1305,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8
   React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74
   ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2
-  RNBitmovinPlayer: 0c7a8e2ad2bf2d9b52b1c4fac0121c30b75a38e4
+  RNBitmovinPlayer: 6b6f43794fa782dc3ccc8d72d46d89b33cde4cb6
   RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
   RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17

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.6.0)
-  - BitmovinPlayer (3.55.0):
+  - BitmovinPlayer (3.56.2):
     - BitmovinAnalyticsCollector/BitmovinPlayer (~> 3.0)
-    - BitmovinPlayerCore (= 3.55.0)
-  - BitmovinPlayerCore (3.55.0)
+    - BitmovinPlayerCore (= 3.56.2)
+  - BitmovinPlayerCore (3.56.2)
   - 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.17.0):
-    - BitmovinPlayer (= 3.55.0)
+    - BitmovinPlayer (= 3.56.2)
     - GoogleAds-IMA-iOS-SDK (= 3.18.4)
     - GoogleAds-IMA-tvOS-SDK (= 4.8.2)
     - React-Core
@@ -1216,8 +1216,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BitmovinAnalyticsCollector: 70f10cfc67f7e4bf38daddf4362f54bd6125683d
-  BitmovinPlayer: 4c42de316c9f56552fcde5cf20701329f55cc0db
-  BitmovinPlayerCore: 6699939e9c37b6047c3afc224245f01c60089ead
+  BitmovinPlayer: d90e291619495dafd0708d7e228bac687a8f7add
+  BitmovinPlayerCore: a1c24e70af1417ccc20c780d938ad116305d685e
   boost: 88202336c3ba1e7a264a83c0c888784b0f360c28
   DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a
   FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba
@@ -1267,7 +1267,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8
   React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74
   ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2
-  RNBitmovinPlayer: 0c7a8e2ad2bf2d9b52b1c4fac0121c30b75a38e4
+  RNBitmovinPlayer: 6b6f43794fa782dc3ccc8d72d46d89b33cde4cb6
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000