Skip to content

Commit

Permalink
Merge branch 'player-testing/cavy-setup' into player-testing/add-play…
Browse files Browse the repository at this point in the history
…er-testing-framework
  • Loading branch information
rolandkakonyi committed Nov 28, 2023
2 parents 1634338 + dbf2c61 commit 7955765
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,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.
Expand All @@ -192,7 +192,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.
Expand Down
10 changes: 0 additions & 10 deletions integration_test/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration_test/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,6 @@ SPEC CHECKSUMS:
Yoga: f67f5769ce78049c5fe798bc735f04535c7bc1ac
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: efb7f1c40473f922252918b9e92257abe9726124
PODFILE CHECKSUM: aa4d941d9c016574cd5330873d8b6d6a8d7ea421

COCOAPODS: 1.14.2

0 comments on commit 7955765

Please sign in to comment.