Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Objective-C/C++ and Java to code formatter script; format those files. #755

Merged
merged 10 commits into from
Nov 23, 2021
Merged

Add Objective-C/C++ and Java to code formatter script; format those files. #755

merged 10 commits into from
Nov 23, 2021

Conversation

jonsimantov
Copy link
Contributor

@jonsimantov jonsimantov commented Nov 22, 2021 •
edited
Loading

Description

Provide details of the change, and generalize the change in the PR title above.

scripts/format_code.py runs clang-format, and it turns out clang-format does just fine on Objective-C, Objective-C++, and Java source files.

This PR enables the code format script to run on those file extensions, and formats those files (to avoid code formatting errors being generated during PR checks).

Testing

Describe how you've tested these changes. Link any manually triggered Integration tests or CPP binary SDK Packaging Github Action workflows, if applicable.

Files manually reviewed.

Type of Change

Place an x the applicable box:

  • Bug fix. Add the issue # below if applicable.
  • New feature. A non-breaking change which adds functionality.
  • Other, such as a build process or documentation change.

Notes

  • Bug fixes and feature changes require an update to the Release Notes section of release_build_files/readme.md.
  • Read the contribution guidelines CONTRIBUTING.md.
  • Changes to the public API require an internal API review. If you'd like to help us make Firebase APIs better, please propose your change in a feature request so that we can discuss it together.

@google-cla google-cla bot added the cla: yes label Nov 22, 2021
@jonsimantov jonsimantov changed the title Add Objective-C/C++ and Java to code formatting. Add Objective-C/C++ and Java to code formatter script; format those files. Nov 22, 2021
@jonsimantov jonsimantov added the skip-release-notes Skip release notes check label Nov 22, 2021
DellaBitta
DellaBitta requested changes Nov 23, 2021
View reviewed changes
Copy link
Contributor

@DellaBitta DellaBitta left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In format_code.py you should remove is_file_objc_header. This was used to avoid formatting objective c headers, and detect object c source directories, but we don't need to avoid them anymore.

@jonsimantov
Copy link
Contributor Author

In format_code.py you should remove is_file_objc_header. This was used to avoid formatting objective c headers, and detect object c source directories, but we don't need to avoid them anymore.

Done, PTAL!

@jonsimantov jonsimantov merged commit 4b090f4 into main Nov 23, 2021
@jonsimantov jonsimantov deleted the build/format_code_objc branch November 23, 2021 22:51
@github-actions github-actions bot added the tests: in-progress This PR's integration tests are in progress. label Nov 23, 2021
@github-actions
Copy link

github-actions bot commented Nov 23, 2021 •
edited
Loading

❌  Integration test FAILED

Requested by @jonsimantov on commit 4b090f4
Last updated: Tue Nov 23 17:08 PST 2021
View integration test log & download artifacts

Failures Configs
functions [TEST] [FAILURE] [tvOS] [macos] [tvos_simulator]
(1 failed tests)  FirebaseFunctionsTest.TestErrorHandling

Add flaky tests to go/fpl-cpp-flake-tracker

@github-actions github-actions bot added the tests: failed This PR's integration tests failed. label Nov 23, 2021
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Nov 24, 2021
DellaBitta added a commit that referenced this pull request Dec 1, 2021
@DellaBitta @sunmou99
@dconeybe @TBarendt @jonsimantov @schmidt-sebastian
Merge main into the AdMob Feature Branch (#771)
4b914d2 
* Fix test on emulator workflow failures (#734)

* If simulator  install ios app failed, reset simulator and try again (#733)

* Trigger workflow move github api cod to github.py (#746)

* Fix a data race that could manifest as null pointer dereference in FutureBase::Release() (#747)

* Cancel callbacks for messaging (#745)

* Cancel callbacks for messaging

util::Terminate is referenced counted som when there ar more APIs than messaging active the callbacks will not be canceled until later and still cause a NULL ref due to the FutureData being destroyed now.

* Cancel callback earlier

* Update readme

* Remove "Android" tag from the release notes entry for #747 (#749)

* Remove calls to LogInfo, LogError, LogDebug during obj-c +load. (#706)

* Remove calls to LogInfo, LogError, LogDebug during obj-c +load.

This could be causing an issue in C++ as global class constructors have not yet been run.

* Add Objective-C/C++ and Java to code formatter script; format those files. (#755)

* Allow format_code to format .m/.mm files; clang-format already knows how.

* Run format_code.py on all objective-c/objective-c++ files.

* Add Java file extensions to format_code.py

* Format all Java source files.

* Remove check for objc header, as they are now supported.

* Format objective-c .h files.

* Don't let lint comment on line length any more; code formatting will report that.

* Messaging crash during initialization (#760)

* Messaging crash during initialization

* Update readme

* Don't redeclare inherited state in CredentialsProviderDesktop (#731)

* Reduce disk space usage when packaging the built SDK (#763)

Remove intermediate build files during desktop packaging step.

This should reduce the disk space usage, as those files (*.o and *.obj) are not required when merging libraries.

* Workaround for Linux x86 build:  downgrade libraries on GitHub runners (#764)

When installing 32-bit Linux dependencies on GitHub runners, downgrade libpcre2-8-0 to an earlier version to ensure compatibility with the i386 version of the package. This is something that should be fixed in a subsequent Ubuntu release and so is a temporary workaround.

This also adds checks to the various prerequisite commands run by build_desktop.py, which was previously just silently ignoring errors (making this much harder to track down). Now it will error out as soon as a command fails.

Co-authored-by: Mou Sun <69009538+sunmou99@users.noreply.github.com>
Co-authored-by: Denver Coneybeare <dconeybe@google.com>
Co-authored-by: Tobias Barendt <tobias@robotsquid.com>
Co-authored-by: Jon Simantov <jsimantov@google.com>
Co-authored-by: Sebastian Schmidt <mrschmidt@google.com>
@firebase firebase locked and limited conversation to collaborators Dec 24, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@DellaBitta DellaBitta DellaBitta approved these changes

Assignees
No one assigned
Labels
cla: yes skip-release-notes Skip release notes check tests: failed This PR's integration tests failed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jonsimantov @DellaBitta