Skip to content

Release 5.12.0 #2051

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
Merged
merged 3 commits into from
Nov 6, 2018
Merged

Release 5.12.0 #2051

merged 3 commits into from
Nov 6, 2018

Conversation

paulb777
Copy link
Member

@paulb777 paulb777 commented Nov 6, 2018

No description provided.

paulb777 and others added 3 commits November 1, 2018 08:49
@paulb777
Update versions for Release 5.12.0
44b02bd
@paulb777
Add missing nanopb flag
b16c770
@wilhuff @paulb777
Isolate Firestore nanopb messages in C++ namespaces (#2046)
bff62bd 
* Add C++ namespaces and use C++ linkage for nanopb-generated sources.
* Regenerate nanopb sources as C++
* Add generated C++ nanopb sources to the podspec
wilhuff
wilhuff reviewed Nov 6, 2018
View reviewed changes
Firestore/Protos/build_protos.py
sources = collect_files(nanopb_out, '.nanopb.h', '.nanopb.c')
post_process_files(sources, add_copyright, nanopb_rename_delete)
sources = collect_files(nanopb_out, '.nanopb.h', '.nanopb.cc')
post_process_files(
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't understand--why is this here? This was merged into master with #2046.

https://github.com/firebase/firebase-ios-sdk/blob/master/Firestore/Protos/build_protos.py#L125

Copy link
Member Author

Choose a reason for hiding this comment

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

I think its a GitHub issue with cherry-pick merging. As far as I can tell the diff is not there. Maybe github just wants us to know the change is coming on this branch too?

ryanwilson
ryanwilson approved these changes Nov 6, 2018
View reviewed changes
Copy link
Member

@ryanwilson ryanwilson left a comment

Choose a reason for hiding this comment

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

LGTM

@paulb777 paulb777 merged commit e77ba8c into master Nov 6, 2018
@paulb777
Copy link
Member Author

paulb777 commented Nov 6, 2018

I accidentally did a squash merge and thinking more about it, I think squash might be better. It doesn't get dupes of the cherry-picks, the branch still exists if we need it, and it should be fine for the release tags not to be in the master history.

bstpierr added a commit that referenced this pull request Nov 9, 2018
@bstpierr
Merge branch 'master' into bs-auth-cleanup
e46aefa 
* master: (128 commits)
  Add a nanopb string (#1839)
  Update Auth samples to sync with internal changes (#2056)
  Add clang-format installation instructions (#2057)
  Delete Firestore public C++ API (#2050)
  Porting Multi-Tab Structural Changes (#2049)
  Remove Mutation tombstones (#2052)
  Release 5.12.0 (#2051)
  Fix analyze errors (#2047)
  Isolate Firestore nanopb messages in C++ namespaces (#2046)
  Fix auth multi app support (#2043)
  Add missing nanopb flag (#2042)
  Delete deprecated files (#2038)
  Address travis timeout flakes (#2033)
  Fix tablet layout for in-app messaging (#2032)
  Held Write Acks Changelog (#2037)
  Remove Held Write Acks (#2029)
  Move #2034 into 5.12.0 (#2036)
  Partially revert "Update CHANGELOG for Firestore v0.14.0 (#2025)" (#2031)
  Revert "gRPC: replace Objective-C implementation with the new C++ implementation (#1968)" (#2030)
  Update CHANGELOG.md for #2034 (#2035)
  ...
rsgowman added a commit that referenced this pull request