From 5840f23dce496b60842306e6ef3b6f1c5cf88c59 Mon Sep 17 00:00:00 2001 From: Roland Kakonyi Date: Tue, 28 Nov 2023 13:10:59 +0100 Subject: [PATCH 1/3] chore: remove workaround from Podfile --- integration_test/ios/Podfile | 10 ---------- integration_test/ios/Podfile.lock | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/integration_test/ios/Podfile b/integration_test/ios/Podfile index cbe9db61..a3963aa9 100644 --- a/integration_test/ios/Podfile +++ b/integration_test/ios/Podfile @@ -63,19 +63,9 @@ post_install do |installer| :mac_catalyst_enabled => false ) __apply_Xcode_12_5_M1_post_install_workaround(installer) - fix_simulator_run(installer) fix_deployment_target(installer) end -def fix_simulator_run(installer) - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" - config.build_settings["EXCLUDED_ARCHS[sdk=appletvsimulator*]"] = "i386" - end - end -end - def fix_deployment_target(installer) return if !installer project = installer.pods_project diff --git a/integration_test/ios/Podfile.lock b/integration_test/ios/Podfile.lock index 686ccbdd..c549e740 100644 --- a/integration_test/ios/Podfile.lock +++ b/integration_test/ios/Podfile.lock @@ -472,7 +472,7 @@ PODS: - React-jsi (= 0.72.6-1) - React-logger (= 0.72.6-1) - React-perflogger (= 0.72.6-1) - - RNBitmovinPlayer (0.14.1): + - RNBitmovinPlayer (0.14.2): - BitmovinPlayer (= 3.49.0) - GoogleAds-IMA-iOS-SDK (= 3.18.4) - GoogleAds-IMA-tvOS-SDK (= 4.8.2) @@ -707,11 +707,11 @@ SPEC CHECKSUMS: React-runtimescheduler: acd6b708338a975a9bb4c594eac0f018f5c15fa3 React-utils: c1cf85c0cd58c11dfb95104a78c608e95d03eb9e ReactCommon: 1dabb8f37c44d8c7370238bd8f504cbad0cfd941 - RNBitmovinPlayer: 29822e8853cfc97c179ab24cda7902ecf6f3f1e0 + RNBitmovinPlayer: 020d9bcad225ddee065212cbba660673e456f391 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Yoga: f67f5769ce78049c5fe798bc735f04535c7bc1ac YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: efb7f1c40473f922252918b9e92257abe9726124 +PODFILE CHECKSUM: aa4d941d9c016574cd5330873d8b6d6a8d7ea421 COCOAPODS: 1.14.2 From 6fd2d8386fc443b0a9dc06f717c006582056ab74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20K=C3=A1konyi?= Date: Tue, 28 Nov 2023 13:11:55 +0100 Subject: [PATCH 2/3] Update CONTRIBUTING.md Co-authored-by: Matthias Tamegger --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f09fc3d9..4759be5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -157,7 +157,7 @@ The `package.json` file contains various scripts for common tasks: - `yarn example start`: start the Metro server for the example app. - `yarn example android`: run the example app on Android. - `yarn example pods`: install pods only. -- `yarn integration-test start`: start the Metro server for the example app. +- `yarn integration-test start`: start the Metro server for the integration tests. - `yarn integration-test test:android`: run the player tests on Android. - `yarn integration-test test:ios`: run the player tests on iOS. - `yarn integration-test pods`: install pods only. From bd45e215a4a7d4d8eac182b32deb0df2ab3c3a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20K=C3=A1konyi?= Date: Tue, 28 Nov 2023 13:12:06 +0100 Subject: [PATCH 3/3] Update CONTRIBUTING.md Co-authored-by: Matthias Tamegger --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4759be5c..c3913cd7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -147,7 +147,7 @@ The `package.json` file contains various scripts for common tasks: - `yarn bootstrap`: setup the whole project by installing all dependencies and pods. - `yarn bootstrap:example`: setup example project by installing all dependencies and pods. -- `yarn bootstrap:integration-test`: setup example project by installing all dependencies and pods. +- `yarn bootstrap:integration-test`: setup integration tests project by installing all dependencies and pods. - `yarn build`: compile TypeScript files into `lib/` with ESBuild. - `yarn typescript`: type-check files with TypeScript. - `yarn lint`: lint files with ESLint.