From 4f441fda8e2f81cb4cd966df7f3444b1c0c5bcba Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Fri, 5 Jul 2024 16:09:04 +0200 Subject: [PATCH 01/20] update CI Xcode version to 15.4 --- .github/actions/setup-environment/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml index 0301f9fb..6db062e6 100644 --- a/.github/actions/setup-environment/action.yml +++ b/.github/actions/setup-environment/action.yml @@ -69,7 +69,7 @@ runs: - uses: maxim-lobanov/setup-xcode@v1 if: ${{ inputs.ios == 'true' }} with: - xcode-version: '14.3' + xcode-version: '15.4' - name: Install dependencies if: ${{ inputs.ios == 'true' || inputs.brew == 'true' }} From 717606b2d7fdf829847444cab45c70d936b3f40f Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Fri, 5 Jul 2024 16:12:22 +0200 Subject: [PATCH 02/20] fix CI triggers when shared actions are updated --- .github/workflows/ci-android.yml | 1 + .github/workflows/ci-ios-tvos.yml | 1 + .github/workflows/ci-typescript.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/ci-android.yml b/.github/workflows/ci-android.yml index 53dc8f9c..a4f0d232 100644 --- a/.github/workflows/ci-android.yml +++ b/.github/workflows/ci-android.yml @@ -15,6 +15,7 @@ on: branches: [development] paths: - '.github/workflows/ci-android.yml' + - '.github/actions/**' - 'package.json' - 'yarn.lock' - 'android/**' diff --git a/.github/workflows/ci-ios-tvos.yml b/.github/workflows/ci-ios-tvos.yml index 25238c4d..eac883a1 100644 --- a/.github/workflows/ci-ios-tvos.yml +++ b/.github/workflows/ci-ios-tvos.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - '.github/workflows/ci-ios-tvos.yml' + - '.github/actions/**' - 'package.json' - 'yarn.lock' - 'ios/**' diff --git a/.github/workflows/ci-typescript.yml b/.github/workflows/ci-typescript.yml index 98bab384..f24776d0 100644 --- a/.github/workflows/ci-typescript.yml +++ b/.github/workflows/ci-typescript.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - '.github/workflows/ci-typescript.yml' + - '.github/actions/**' - '**.ts' - '**.tsx' - '**.js' From 68271d8528954928b7d132bd9931dbeed47fb529 Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Fri, 5 Jul 2024 16:41:02 +0200 Subject: [PATCH 03/20] change swift version requirement to 5.10 --- RNBitmovinPlayer.podspec | 1 + example/ios/Podfile.lock | 2 +- integration_test/ios/Podfile.lock | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RNBitmovinPlayer.podspec b/RNBitmovinPlayer.podspec index 2c7c2f33..6a9dd016 100644 --- a/RNBitmovinPlayer.podspec +++ b/RNBitmovinPlayer.podspec @@ -18,6 +18,7 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm,swift}" + s.swift_version = "5.10" s.dependency "React-Core" s.dependency "BitmovinPlayer", "3.66.1" s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.23.0" diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 5581c87f..a743c3aa 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1302,7 +1302,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNBitmovinPlayer: 9f7f67e1f328ff02132104e24e36ac3a620d6015 + RNBitmovinPlayer: 62ea194fbe37d42e682a0568ea878bccc7ee618c RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 diff --git a/integration_test/ios/Podfile.lock b/integration_test/ios/Podfile.lock index fdac69f9..2fcc701f 100644 --- a/integration_test/ios/Podfile.lock +++ b/integration_test/ios/Podfile.lock @@ -1267,7 +1267,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNBitmovinPlayer: 9f7f67e1f328ff02132104e24e36ac3a620d6015 + RNBitmovinPlayer: 62ea194fbe37d42e682a0568ea878bccc7ee618c SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1 From 58fbe2bd9f91a6f12defd12472d14bc9de0141cb Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Mon, 8 Jul 2024 05:40:42 +0200 Subject: [PATCH 04/20] improve CI setup --- .github/workflows/ci-android.yml | 1 + .github/workflows/ci-ios-tvos.yml | 1 + .github/workflows/ci-typescript.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/ci-android.yml b/.github/workflows/ci-android.yml index a4f0d232..e1b692c8 100644 --- a/.github/workflows/ci-android.yml +++ b/.github/workflows/ci-android.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - '.github/workflows/ci-android.yml' + - '.github/actions/**' - 'package.json' - 'yarn.lock' - 'android/**' diff --git a/.github/workflows/ci-ios-tvos.yml b/.github/workflows/ci-ios-tvos.yml index eac883a1..5dfa8b8f 100644 --- a/.github/workflows/ci-ios-tvos.yml +++ b/.github/workflows/ci-ios-tvos.yml @@ -19,6 +19,7 @@ on: branches: [development] paths: - '.github/workflows/ci-ios-tvos.yml' + - '.github/actions/**' - 'package.json' - 'yarn.lock' - 'ios/**' diff --git a/.github/workflows/ci-typescript.yml b/.github/workflows/ci-typescript.yml index f24776d0..90cb5757 100644 --- a/.github/workflows/ci-typescript.yml +++ b/.github/workflows/ci-typescript.yml @@ -25,6 +25,7 @@ on: branches: [development] paths: - '.github/workflows/ci-typescript.yml' + - '.github/actions/**' - '**.ts' - '**.tsx' - '**.js' From 4efecdefb1bd7c0b30ca0aab9a134dc3f4913fb9 Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Mon, 8 Jul 2024 06:01:33 +0200 Subject: [PATCH 05/20] fix pods cache --- .github/actions/setup-environment/action.yml | 16 ----- .github/workflows/ci-ios-tvos.yml | 22 +++++- Brewfile | 1 + Brewfile.lock.json | 74 +++++++++++++++----- 4 files changed, 79 insertions(+), 34 deletions(-) diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml index 6db062e6..619aa3c3 100644 --- a/.github/actions/setup-environment/action.yml +++ b/.github/actions/setup-environment/action.yml @@ -18,10 +18,6 @@ inputs: description: Setup xcode and install dependencies (overrides `brew` input) default: false required: false - restore-pods: - description: Restores the Pod cache - default: false - required: false java: description: Setup Java and Gradle cache default: false @@ -75,15 +71,3 @@ runs: if: ${{ inputs.ios == 'true' || inputs.brew == 'true' }} shell: bash run: brew bundle install - - - name: Restore Pods cache - if: ${{ inputs.restore-pods == 'true' }} - id: pods-cache-restore - uses: actions/cache/restore@v3 - with: - path: | - .cocoapods-cache - example/ios/Pods - integration_test/ios/Pods - key: pods-${{ hashFiles('example/ios/Podfile.lock') }}-${{ hashFiles('integration_test/ios/Podfile.lock') }} - restore-keys: pods- diff --git a/.github/workflows/ci-ios-tvos.yml b/.github/workflows/ci-ios-tvos.yml index 5dfa8b8f..c23970c5 100644 --- a/.github/workflows/ci-ios-tvos.yml +++ b/.github/workflows/ci-ios-tvos.yml @@ -66,7 +66,16 @@ jobs: node: true subprojects: true ios: true - restore-pods: true + + - name: Restore Pods cache + id: pods-cache-restore + uses: actions/cache/restore@v3 + with: + path: | + .cocoapods-cache + example/ios/Pods + key: pods-${{ hashFiles('example/ios/Podfile.lock') }} + restore-keys: pods- - name: Install pods run: | @@ -110,7 +119,16 @@ jobs: node: true subprojects: true ios: true - restore-pods: true + + - name: Restore Pods cache + id: pods-cache-restore + uses: actions/cache/restore@v3 + with: + path: | + .cocoapods-cache + example/ios/Pods + key: pods-${{ hashFiles('example/ios/Podfile.lock') }} + restore-keys: pods- - name: Install pods run: | diff --git a/Brewfile b/Brewfile index 5bfe6f03..54df705a 100644 --- a/Brewfile +++ b/Brewfile @@ -1 +1,2 @@ brew "swiftlint" +brew "xcbeautify" diff --git a/Brewfile.lock.json b/Brewfile.lock.json index 01fbf6a1..ed6c3e1b 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -2,45 +2,79 @@ "entries": { "brew": { "swiftlint": { - "version": "0.53.0", + "version": "0.55.1", "bottle": { - "rebuild": 0, + "rebuild": 1, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:240ccda9de55d948d0c635798079074099bfcb73ffda41428900fdc748aeea7b", - "sha256": "240ccda9de55d948d0c635798079074099bfcb73ffda41428900fdc748aeea7b" + "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:0610290fef665ecfc022ec3e8e3986224841290274a21efdee503e76b7b39bcc", + "sha256": "0610290fef665ecfc022ec3e8e3986224841290274a21efdee503e76b7b39bcc" }, "arm64_ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:7b7ceb7896c6833965cc4eac9001255d8adde6c5432045d5a8ab6aea8a9e81d9", - "sha256": "7b7ceb7896c6833965cc4eac9001255d8adde6c5432045d5a8ab6aea8a9e81d9" + "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:af05ed001b0476ed0391778516ed92cc3ed100593a03794025c1814e6dec0cb4", + "sha256": "af05ed001b0476ed0391778516ed92cc3ed100593a03794025c1814e6dec0cb4" }, "arm64_monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:78c2a4c3f4a2f6847b484527b0f0f916da71e3ee29e49890fd44b63fe7b38e26", - "sha256": "78c2a4c3f4a2f6847b484527b0f0f916da71e3ee29e49890fd44b63fe7b38e26" + "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:2e1313a57188d5a751f038596509f0186a058669abfd21aa3142457f9c16c478", + "sha256": "2e1313a57188d5a751f038596509f0186a058669abfd21aa3142457f9c16c478" }, "sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:abdca78dd8a8bd268053b3be195fe891bb74aef5502ab3a6b871ae0c6bb04540", - "sha256": "abdca78dd8a8bd268053b3be195fe891bb74aef5502ab3a6b871ae0c6bb04540" + "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:148e407d81cedffbe76876288f78a35fee69f82d12b2fb3356ca102c2fd6d319", + "sha256": "148e407d81cedffbe76876288f78a35fee69f82d12b2fb3356ca102c2fd6d319" }, "ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:be711c707bf3b49fa0dd6e2ae576b309aad620f9b56a2c6e7b1ac5cf35cf652a", - "sha256": "be711c707bf3b49fa0dd6e2ae576b309aad620f9b56a2c6e7b1ac5cf35cf652a" + "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:709d73d12dd3adf64e276b04e94949749b5073f7ca946e0ead585557cfe9277c", + "sha256": "709d73d12dd3adf64e276b04e94949749b5073f7ca946e0ead585557cfe9277c" }, "monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:13487d68a971dbe035019364e19d70641af2a18c06e52925d238685b384a7979", - "sha256": "13487d68a971dbe035019364e19d70641af2a18c06e52925d238685b384a7979" + "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:30ea7b1e56634ccd521ffe86a93372e02004cf25b0a10432a5b54520a71d4139", + "sha256": "30ea7b1e56634ccd521ffe86a93372e02004cf25b0a10432a5b54520a71d4139" + }, + "x86_64_linux": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:0f68576b2b4591e126e923278c4aa25c28aa18b7e5a9f8a3b8d7cf8eeacfe3a2", + "sha256": "0f68576b2b4591e126e923278c4aa25c28aa18b7e5a9f8a3b8d7cf8eeacfe3a2" + } + } + } + }, + "xcbeautify": { + "version": "2.4.0", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_sonoma": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:6a51e17f553aa9d493bf806489fa506c178fed38b18b45a94cd6cbb8a50ed042", + "sha256": "6a51e17f553aa9d493bf806489fa506c178fed38b18b45a94cd6cbb8a50ed042" + }, + "arm64_ventura": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:9717191935a921a937474cc785728238efe4cbea9d590d97927f4f9c990d5e6b", + "sha256": "9717191935a921a937474cc785728238efe4cbea9d590d97927f4f9c990d5e6b" + }, + "sonoma": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:61a163991b33aa679931917fb1952aa9d6c3b3bf57c5637c24be89da513cb49f", + "sha256": "61a163991b33aa679931917fb1952aa9d6c3b3bf57c5637c24be89da513cb49f" + }, + "ventura": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:08bdbf866a823ba2d27db510eaaf191d0c2a87a69687b86c5efa96e546f43d51", + "sha256": "08bdbf866a823ba2d27db510eaaf191d0c2a87a69687b86c5efa96e546f43d51" }, "x86_64_linux": { "cellar": "/home/linuxbrew/.linuxbrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:fbbc56fccfcfcd34564feb7325567e2ff3638d3c609396a5c4aa13311c7b26e0", - "sha256": "fbbc56fccfcfcd34564feb7325567e2ff3638d3c609396a5c4aa13311c7b26e0" + "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:a157d806c66671dec34bd0dc3dd7ae5fe193e59a527579db79ba7d3fe1824770", + "sha256": "a157d806c66671dec34bd0dc3dd7ae5fe193e59a527579db79ba7d3fe1824770" } } } @@ -56,6 +90,14 @@ "CLT": "", "Xcode": "15.0.1", "macOS": "14.0" + }, + "sequoia": { + "HOMEBREW_VERSION": "4.3.8", + "HOMEBREW_PREFIX": "/opt/homebrew", + "Homebrew/homebrew-core": "api", + "CLT": "16.0.0.0.1.1719078471", + "Xcode": "16.0", + "macOS": "15.0" } } } From d3c5f16b43ff7d3f4d05b58e9d8126b20f4d4d61 Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Mon, 8 Jul 2024 13:50:08 +0200 Subject: [PATCH 06/20] fix iOS CI pods restore --- .github/workflows/ci-ios-tvos.yml | 2 +- .github/workflows/create-sdk-update-pr.yml | 11 ++++++++++- .github/workflows/start-release-train.yml | 11 ++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-ios-tvos.yml b/.github/workflows/ci-ios-tvos.yml index c23970c5..ad9ba65e 100644 --- a/.github/workflows/ci-ios-tvos.yml +++ b/.github/workflows/ci-ios-tvos.yml @@ -127,7 +127,7 @@ jobs: path: | .cocoapods-cache example/ios/Pods - key: pods-${{ hashFiles('example/ios/Podfile.lock') }} + key: pods-${{ hashFiles('example/ios/Podfile.lock') }}-${{ hashFiles('integration_test/ios/Podfile.lock') }} restore-keys: pods- - name: Install pods diff --git a/.github/workflows/create-sdk-update-pr.yml b/.github/workflows/create-sdk-update-pr.yml index 7a858374..0aac4863 100644 --- a/.github/workflows/create-sdk-update-pr.yml +++ b/.github/workflows/create-sdk-update-pr.yml @@ -50,9 +50,18 @@ jobs: uses: ./.github/actions/setup-environment with: node: true - restore-pods: true brew: true + - name: Restore Pods cache + id: pods-cache-restore + uses: actions/cache/restore@v3 + with: + path: | + .cocoapods-cache + example/ios/Pods + key: pods-${{ hashFiles('example/ios/Podfile.lock') }}-${{ hashFiles('integration_test/ios/Podfile.lock') }} + restore-keys: pods- + - name: Bump iOS player SDK version if: ${{ inputs.sdk_name == 'ios' }} run: | diff --git a/.github/workflows/start-release-train.yml b/.github/workflows/start-release-train.yml index 153fcfcd..d4d66d13 100644 --- a/.github/workflows/start-release-train.yml +++ b/.github/workflows/start-release-train.yml @@ -43,7 +43,16 @@ jobs: uses: ./.github/actions/setup-environment with: node: true - restore-pods: true + + - name: Restore Pods cache + id: pods-cache-restore + uses: actions/cache/restore@v3 + with: + path: | + .cocoapods-cache + example/ios/Pods + key: pods-${{ hashFiles('example/ios/Podfile.lock') }}-${{ hashFiles('integration_test/ios/Podfile.lock') }} + restore-keys: pods- - name: Set Release Branch name id: branching From 38edaf41c0c917bc1c1b9e95186db2bc42e5c010 Mon Sep 17 00:00:00 2001 From: bitPlayerGHActions <108659280+bitPlayerGHActions@users.noreply.github.com> Date: Thu, 18 Jul 2024 09:37:03 +0200 Subject: [PATCH 07/20] Update android player to 3.75.1+jason (#488) Automated android player version update to 3.75.1+jason Co-authored-by: Update Bot --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index bfa81597..703ee236 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -105,5 +105,5 @@ dependencies { // Bitmovin implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' - implementation 'com.bitmovin.player:player:3.74.0+jason' + implementation 'com.bitmovin.player:player:3.75.1+jason' } From 69a950e32f63ec5296ec3855e2422de0e383037d Mon Sep 17 00:00:00 2001 From: Update Bot Date: Fri, 19 Jul 2024 13:30:31 +0000 Subject: [PATCH 08/20] chore(ios): update ios player version to 3.67.0 --- RNBitmovinPlayer.podspec | 2 +- example/ios/Podfile.lock | 16 ++++++++-------- integration_test/ios/Podfile.lock | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/RNBitmovinPlayer.podspec b/RNBitmovinPlayer.podspec index 6a9dd016..1bc03599 100644 --- 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.66.1" + s.dependency "BitmovinPlayer", "3.67.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 index a239bdd2..0739faba 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -3,10 +3,10 @@ PODS: - BitmovinAnalyticsCollector/Core - BitmovinPlayerCore (~> 3.48) - BitmovinAnalyticsCollector/Core (3.7.0) - - BitmovinPlayer (3.66.1): + - BitmovinPlayer (3.67.0): - BitmovinAnalyticsCollector/BitmovinPlayer (~> 3.0) - - BitmovinPlayerCore (= 3.66.1) - - BitmovinPlayerCore (3.66.1) + - BitmovinPlayerCore (= 3.67.0) + - BitmovinPlayerCore (3.67.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.27.1): - - BitmovinPlayer (= 3.66.1) + - BitmovinPlayer (= 3.67.0) - GoogleAds-IMA-iOS-SDK (= 3.23.0) - GoogleAds-IMA-tvOS-SDK (= 4.13.0) - React-Core @@ -1246,8 +1246,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BitmovinAnalyticsCollector: bbd82c0b8e11aefacd8e53b6e40c62f2cba6f3f5 - BitmovinPlayer: 0d5990c196eff314b7081c49ed481e9d465d7281 - BitmovinPlayerCore: f6f8b8655bece7c8e9daccc49cc55642212d9c2f + BitmovinPlayer: 48ee17de9e0bbd310d874112bab92cb78f5e1cbf + BitmovinPlayerCore: da464f49a91a1308519a7187088822e33f1d057b boost: 88202336c3ba1e7a264a83c0c888784b0f360c28 DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba @@ -1302,11 +1302,11 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNBitmovinPlayer: a740646ccc2a93e73be8a048c14ee8c2f95b0998 + RNBitmovinPlayer: f3f33608424dedba8c1ad297f9f4c7a7555de977 RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1 + Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000 PODFILE CHECKSUM: e89ebfe6215567e7e15880586d123e5ea122588c diff --git a/integration_test/ios/Podfile.lock b/integration_test/ios/Podfile.lock index 8b9ee556..46414550 100644 --- 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.7.0) - - BitmovinPlayer (3.66.1): + - BitmovinPlayer (3.67.0): - BitmovinAnalyticsCollector/BitmovinPlayer (~> 3.0) - - BitmovinPlayerCore (= 3.66.1) - - BitmovinPlayerCore (3.66.1) + - BitmovinPlayerCore (= 3.67.0) + - BitmovinPlayerCore (3.67.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.27.1): - - BitmovinPlayer (= 3.66.1) + - BitmovinPlayer (= 3.67.0) - GoogleAds-IMA-iOS-SDK (= 3.23.0) - GoogleAds-IMA-tvOS-SDK (= 4.13.0) - React-Core @@ -1216,8 +1216,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: BitmovinAnalyticsCollector: bbd82c0b8e11aefacd8e53b6e40c62f2cba6f3f5 - BitmovinPlayer: 0d5990c196eff314b7081c49ed481e9d465d7281 - BitmovinPlayerCore: f6f8b8655bece7c8e9daccc49cc55642212d9c2f + BitmovinPlayer: 48ee17de9e0bbd310d874112bab92cb78f5e1cbf + BitmovinPlayerCore: da464f49a91a1308519a7187088822e33f1d057b boost: 88202336c3ba1e7a264a83c0c888784b0f360c28 DoubleConversion: 74cb0ce4de271b23e772567504735c87134edf0a FBLazyVector: 33a271a7e8de0bd321e47356d8bc3b2d5fb9ddba @@ -1267,9 +1267,9 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNBitmovinPlayer: a740646ccc2a93e73be8a048c14ee8c2f95b0998 + RNBitmovinPlayer: f3f33608424dedba8c1ad297f9f4c7a7555de977 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1 + Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000 PODFILE CHECKSUM: 0bfe194f5e28f1cf54d3d732eda8c78fadbeeedd From 3266a32ff10221585b0c5dd746c376dc13fb383a Mon Sep 17 00:00:00 2001 From: bitPlayerGHActions <108659280+bitPlayerGHActions@users.noreply.github.com> Date: Fri, 26 Jul 2024 10:42:43 +0200 Subject: [PATCH 09/20] Update android player to 3.77.0+jason (#494) Automated android player version update to 3.77.0+jason Co-authored-by: Update Bot --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 703ee236..92e37723 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -105,5 +105,5 @@ dependencies { // Bitmovin implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' - implementation 'com.bitmovin.player:player:3.75.1+jason' + implementation 'com.bitmovin.player:player:3.77.0+jason' } From a209104dfc7baaeced4a0b1f8ea26287e45ebf5f Mon Sep 17 00:00:00 2001 From: Update Bot Date: Fri, 26 Jul 2024 10:37:46 +0000 Subject: [PATCH 10/20] chore(android): update android player version to 3.77.1+jason --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 92e37723..0765e7e2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -105,5 +105,5 @@ dependencies { // Bitmovin implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' - implementation 'com.bitmovin.player:player:3.77.0+jason' + implementation 'com.bitmovin.player:player:3.77.1+jason' } From 63a0ecae52b8e4ef3b1ff0fd4b0bf74561482ff4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:45:30 +0000 Subject: [PATCH 11/20] Bump fast-xml-parser from 4.4.0 to 4.4.1 Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v4.4.0...v4.4.1) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ff2921eb..c0d9a90c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3964,9 +3964,9 @@ fast-levenshtein@^2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fast-xml-parser@^4.0.12, fast-xml-parser@^4.2.4: - version "4.4.0" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz#341cc98de71e9ba9e651a67f41f1752d1441a501" - integrity sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg== + version "4.4.1" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f" + integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw== dependencies: strnum "^1.0.5" From f6ed94476a5e8d26941885f3728ed10aff59bb22 Mon Sep 17 00:00:00 2001 From: saravanan Date: Mon, 5 Aug 2024 14:42:48 +0800 Subject: [PATCH 12/20] exposed preloadOffset property --- src/advertising.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/advertising.ts b/src/advertising.ts index ead59fd2..60dabf2c 100644 --- a/src/advertising.ts +++ b/src/advertising.ts @@ -1,3 +1,5 @@ +import { Double } from 'react-native/Libraries/Types/CodegenTypes'; + /** * Quartiles that can be reached during an ad playback. */ @@ -76,6 +78,12 @@ export interface AdItem { * The fallback ad sources need to have the same `AdSourceType` as the main ad source. */ sources: AdSource[]; + + /** + * The amount of seconds the ad manifest is loaded in advance; + * i.e as compared to when the ad break is scheduled for playback. + */ + preloadOffset: Double; } /** From 01ee2ab648ef5f9ef68af040347db37f62af8476 Mon Sep 17 00:00:00 2001 From: saravanan Date: Mon, 5 Aug 2024 16:29:19 +0800 Subject: [PATCH 13/20] updated documentaton and JsonConverter for AdItem --- .../bitmovin/player/reactnative/converter/JsonConverter.kt | 1 + src/advertising.ts | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt b/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt index c1eb0ae5..494a1b5b 100644 --- a/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt +++ b/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt @@ -206,6 +206,7 @@ fun ReadableMap.toAdItem(): AdItem? { return AdItem( sources = getArray("sources") ?.toMapList()?.mapNotNull { it?.toAdSource() }?.toTypedArray() ?: return null, position = getString("position") ?: "pre", + preloadOffset = getString("preloadOffset") ?: 0, ) } diff --git a/src/advertising.ts b/src/advertising.ts index 60dabf2c..cc2ad45a 100644 --- a/src/advertising.ts +++ b/src/advertising.ts @@ -1,5 +1,3 @@ -import { Double } from 'react-native/Libraries/Types/CodegenTypes'; - /** * Quartiles that can be reached during an ad playback. */ @@ -80,10 +78,12 @@ export interface AdItem { sources: AdSource[]; /** + * @platform Android * The amount of seconds the ad manifest is loaded in advance; * i.e as compared to when the ad break is scheduled for playback. + * Default value is 0.0 */ - preloadOffset: Double; + preloadOffset: Number; } /** From 9ab2ff3511401c45827f628c89a18f70ec50d31f Mon Sep 17 00:00:00 2001 From: saravanan Date: Mon, 5 Aug 2024 16:42:12 +0800 Subject: [PATCH 14/20] updated preloadOffset property as optional --- src/advertising.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/advertising.ts b/src/advertising.ts index cc2ad45a..0d2824de 100644 --- a/src/advertising.ts +++ b/src/advertising.ts @@ -83,7 +83,7 @@ export interface AdItem { * i.e as compared to when the ad break is scheduled for playback. * Default value is 0.0 */ - preloadOffset: Number; + preloadOffset?: Number; } /** From 2cd54d0b68eaabf3603c827d4a0eccbfe19264a2 Mon Sep 17 00:00:00 2001 From: saravanan Date: Mon, 5 Aug 2024 16:44:21 +0800 Subject: [PATCH 15/20] corrected preloadOffset property type to number --- src/advertising.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/advertising.ts b/src/advertising.ts index 0d2824de..2d3726dc 100644 --- a/src/advertising.ts +++ b/src/advertising.ts @@ -83,7 +83,7 @@ export interface AdItem { * i.e as compared to when the ad break is scheduled for playback. * Default value is 0.0 */ - preloadOffset?: Number; + preloadOffset?: number; } /** From ea99facb35694f99949b354d6f4660b07cc30728 Mon Sep 17 00:00:00 2001 From: saravanan Date: Mon, 5 Aug 2024 17:01:04 +0800 Subject: [PATCH 16/20] fixed default value to 0.0 to conform to type Double --- .../com/bitmovin/player/reactnative/converter/JsonConverter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt b/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt index 494a1b5b..993fadab 100644 --- a/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt +++ b/android/src/main/java/com/bitmovin/player/reactnative/converter/JsonConverter.kt @@ -206,7 +206,7 @@ fun ReadableMap.toAdItem(): AdItem? { return AdItem( sources = getArray("sources") ?.toMapList()?.mapNotNull { it?.toAdSource() }?.toTypedArray() ?: return null, position = getString("position") ?: "pre", - preloadOffset = getString("preloadOffset") ?: 0, + preloadOffset = getDoubleOrNull("preloadOffset") ?: 0.0, ) } From f93e8c974bfca7d8856eaf7b56857e2def31f9c0 Mon Sep 17 00:00:00 2001 From: saravanans-github Date: Mon, 5 Aug 2024 17:02:33 +0800 Subject: [PATCH 17/20] Update src/advertising.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update documentation formatting Co-authored-by: Roland Kákonyi --- src/advertising.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/advertising.ts b/src/advertising.ts index 2d3726dc..d1657283 100644 --- a/src/advertising.ts +++ b/src/advertising.ts @@ -78,10 +78,12 @@ export interface AdItem { sources: AdSource[]; /** - * @platform Android - * The amount of seconds the ad manifest is loaded in advance; - * i.e as compared to when the ad break is scheduled for playback. + * The amount of seconds the ad manifest is loaded in advance + * compared to when the ad break is scheduled for playback. + * * Default value is 0.0 + * + * @platform Android */ preloadOffset?: number; } From 44ee964c220fe0f6c8baf5a3e056c6e6313edd7f Mon Sep 17 00:00:00 2001 From: bitPlayerGHActions <108659280+bitPlayerGHActions@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:33:23 +0200 Subject: [PATCH 18/20] Update android player to 3.78.0+jason (#497) Automated android player version update to 3.78.0+jason Co-authored-by: Update Bot --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 0765e7e2..a1a1e321 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -105,5 +105,5 @@ dependencies { // Bitmovin implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.31.0' implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' - implementation 'com.bitmovin.player:player:3.77.1+jason' + implementation 'com.bitmovin.player:player:3.78.0+jason' } From fc9dab0b458380cde2cd5ad128da0f2fe8e1ee59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20K=C3=A1konyi?= Date: Wed, 7 Aug 2024 09:02:37 +0200 Subject: [PATCH 19/20] Add missing CHANGELOG.md entries --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf061184..0ab07af9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [Unreleased] + +### Added + +- Android: `AdItem.preloadOffset` to control when ad manifest gets loaded + +### Changed + +- Update Bitmovin's native Android SDK version to `3.78.0` +- Update Bitmovin's native iOS SDK version to `3.67.0` + ## [0.27.1] - 2024-07-05 ### Fixed From d4083852bdac6a7824fc2e3f8f6ce9e6ed5fd351 Mon Sep 17 00:00:00 2001 From: Bitmovin Release Automation Date: Wed, 7 Aug 2024 07:17:05 +0000 Subject: [PATCH 20/20] prepare release 0.28.0 --- CHANGELOG.md | 2 +- example/ios/Podfile.lock | 4 ++-- integration_test/ios/Podfile.lock | 4 ++-- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ab07af9..e0206550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [Unreleased] +## [0.28.0] ### Added diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 0739faba..a8f7b647 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1048,7 +1048,7 @@ PODS: - React-jsi (= 0.73.4-0) - React-logger (= 0.73.4-0) - React-perflogger (= 0.73.4-0) - - RNBitmovinPlayer (0.27.1): + - RNBitmovinPlayer (0.28.0): - BitmovinPlayer (= 3.67.0) - GoogleAds-IMA-iOS-SDK (= 3.23.0) - GoogleAds-IMA-tvOS-SDK (= 4.13.0) @@ -1302,7 +1302,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNBitmovinPlayer: f3f33608424dedba8c1ad297f9f4c7a7555de977 + RNBitmovinPlayer: ae4f785479c566a71bf03d84bde7ec139eb22eaa RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 diff --git a/integration_test/ios/Podfile.lock b/integration_test/ios/Podfile.lock index 46414550..28310380 100644 --- a/integration_test/ios/Podfile.lock +++ b/integration_test/ios/Podfile.lock @@ -1040,7 +1040,7 @@ PODS: - React-jsi (= 0.73.4-0) - React-logger (= 0.73.4-0) - React-perflogger (= 0.73.4-0) - - RNBitmovinPlayer (0.27.1): + - RNBitmovinPlayer (0.28.0): - BitmovinPlayer (= 3.67.0) - GoogleAds-IMA-iOS-SDK (= 3.23.0) - GoogleAds-IMA-tvOS-SDK (= 4.13.0) @@ -1267,7 +1267,7 @@ SPEC CHECKSUMS: React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8 React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74 ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2 - RNBitmovinPlayer: f3f33608424dedba8c1ad297f9f4c7a7555de977 + RNBitmovinPlayer: ae4f785479c566a71bf03d84bde7ec139eb22eaa SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000 diff --git a/package.json b/package.json index a7894371..50654008 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bitmovin-player-react-native", - "version": "0.27.1", + "version": "0.28.0", "description": "Official React Native bindings for Bitmovin's mobile Player SDKs.", "main": "lib/index.js", "module": "lib/index.mjs",