merge master + namespace fixup #2117
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allow for custo domains to be whitelisted by the info.plist file.
typeof() is not supported in some C language dialects which causes issues when integrating FDL in projects that do use non-GNU compiler modes. For example, this causes problems when building in some versions of Unity firebase/quickstart-unity#228
typeof() is not supported in some C language dialects which causes issues when integrating FDL in projects that do use non-GNU compiler modes. For example, this causes problems when building in some versions of Unity firebase/quickstart-unity#228
DynamicLinks patch version for c99 compatibility fix
Lock reads and writes to session map
* Wrap diagnostics notification in collection flag check. Some of the diagnostics notifications were missed and not covered by the data collection flag. * Remove redundant notification call, move Core diagnostics API call. * Removed configure with no options test.
* Remove unnecessary notification flag. This was added when the Google pod could configure Firebase but the Google pod is deprecated and can only work with Firebase 3.X. These flags and conditional checks can be safely removed. * Resolve issues from commit split. * Style fixes.
* Reduce singleton usage in FIRApp tests. There have been some issues while creating new tests of conflicts with mocks of classes and instances, this should alleviate some of those conflicts in the future. * Remove bad style changes. * Use default app name flag instead of local variable.
* Trigger travis for Firestore podspec changes
`typeof` is only defined if you compile with GNU extensions, while `__typeof__` is always available. This is the Firestore equivalent of #1982. Note that Firestore won't yet build in this mode because among other things the Objective-C gRPC still uses `typeof`. Once we eliminate that dependency this might become possible.
Release 5.11.0
…from labels in card layout Storyboard (#2083)
…2062) * replace all references to `FSTDispatchQueue` and `FSTTimerID` with their C++ equivalents; * remove `FSTDispatchQueue` class and related tests; * in method argument names, replace `workerDispatchQueue` with just `workerQueue`, more similar to other platforms; * move `Executor` and derived classes out of `internal` namespace.
* Register Database with Interop + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports * Use Interop for Auth token fetching + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports * Implement necessary protocols + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase * Squash of my previous local commits for Database Interop Register Database with Interop: + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports Use Interop for Auth token fetching: + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports Implement necessary protocols: + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase Clean up Database tests: - Removed all unnecessary header files ~ Ran style.sh across all the tests Cleaned Up project file: Some header removals were missed in the last commit. Sorted some test files Fix Database Fake App Tests: + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * Revert "Squash of my previous local commits for Database Interop" This reverts commit c0d0421. * Cleaned Up project file Some header removals were missed in the last commit. * Sorted some test files * Fix Database Fake App Tests + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * PR Feedback Changes + Created new FIRDatabaseComponent class to encapsulate instance creation + Updated FAuthTokenProvider to only use an auth instance rather than an app. * PR Feedback Follow-Up - Removed FIRDatabase registration code * pod deintegrate * Move instance management Somes tests may still be out of date. * Fix Auth integration test * pod deintegrate -- again * PR Feedback * PR Feedback Added the FIRComponentLifecycleMaintainer protocol to FIRDatabaseComponent * Update Firebase/Database/Api/FIRDatabaseComponent.m Missed some small changes * Get integration tests compiling * Fix some tests * Fixed more tests Component needs to be cacheable in order to get the appWIllBeDeleted callback. * Update target memberships * Revert project file changes * Add FIRAuthInteropFake for broken targets * PR feedback * Spacing and Style * Moved `instances` to ivar * Simplify FIRDatabaseDictionary It's now keyed on the URL with the app being implied since each app will get its own `FIRDatabaseComponent`
* Revert "Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https (#2078)" This reverts commit ceb8392. * Revert "Allow setting the domainURIPrefix for custom domain names/paths when creating dynamic links (#2071)" This reverts commit d917bac. * Revert "Minor edits: change domain names in test app plist, fix warnings." This reverts commit 15f5d46. * Revert "Fix style. Run ./scripts/style.sh" This reverts commit 0e16e6c. * Revert "Allow for custom domains in the FDL iOS SDK" This reverts commit 5e33153. * Version is still 3.2.0
* Update versions for Release 5.13.0 * Revert premature api changes (#2097) * Revert "Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https (#2078)" This reverts commit ceb8392. * Revert "Allow setting the domainURIPrefix for custom domain names/paths when creating dynamic links (#2071)" This reverts commit d917bac. * Revert "Minor edits: change domain names in test app plist, fix warnings." This reverts commit 15f5d46. * Revert "Fix style. Run ./scripts/style.sh" This reverts commit 0e16e6c. * Revert "Allow for custom domains in the FDL iOS SDK" This reverts commit 5e33153. * Version is still 3.2.0
While gRPC-C++ is in its 0.* versions, any new version could potentially contain breaking changes. Make sure we only upgrade at our own pace.
* Register Database with Interop + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports * Use Interop for Auth token fetching + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports * Implement necessary protocols + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase * Squash of my previous local commits for Database Interop Register Database with Interop: + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports Use Interop for Auth token fetching: + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports Implement necessary protocols: + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase Clean up Database tests: - Removed all unnecessary header files ~ Ran style.sh across all the tests Cleaned Up project file: Some header removals were missed in the last commit. Sorted some test files Fix Database Fake App Tests: + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * Revert "Squash of my previous local commits for Database Interop" This reverts commit c0d0421. * Cleaned Up project file Some header removals were missed in the last commit. * Sorted some test files * Fix Database Fake App Tests + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * PR Feedback Changes + Created new FIRDatabaseComponent class to encapsulate instance creation + Updated FAuthTokenProvider to only use an auth instance rather than an app. * PR Feedback Follow-Up - Removed FIRDatabase registration code * pod deintegrate * Move instance management Somes tests may still be out of date. * Fix Auth integration test * pod deintegrate -- again * PR Feedback * PR Feedback Added the FIRComponentLifecycleMaintainer protocol to FIRDatabaseComponent * Update Firebase/Database/Api/FIRDatabaseComponent.m Missed some small changes * Get integration tests compiling * Fix some tests * Fixed more tests Component needs to be cacheable in order to get the appWIllBeDeleted callback. * Update target memberships * Revert project file changes * Add FIRAuthInteropFake for broken targets * PR feedback * Spacing and Style * Moved `instances` to ivar * Simplify FIRDatabaseDictionary It's now keyed on the URL with the app being implied since each app will get its own `FIRDatabaseComponent` * Fix Database Integration Tests Have the FakeApp cache DB instances Use the Full host/URL path to cache DB instances Simplified shared scheme ``` Test Suite 'Database_IntegrationTests_iOS.xctest' passed at 2018-11-20 07:09:30.520. Executed 326 tests, with 0 failures (0 unexpected) in 66.251 (66.528) seconds Test Suite 'All tests' passed at 2018-11-20 07:09:30.522. Executed 326 tests, with 0 failures (0 unexpected) in 66.251 (66.530) seconds ``` * Clarify defaultApp use
…es if necessary (#2106) gRPC-C++ versions up to and including 0.0.3, and also 0.0.5, don't bundle `roots.pem` in the podspec. gRPC-C++ 0.0.4 and, presumably, the currently not-yet-released 0.0.6 do. Firestore currently also bundles this file under the same bundle name, which leads to build errors when both Firestore and gRPC-C++ try to add the file into the build (only shows during archiving). For transition, this PR: * renames the Firestore bundle to avoid naming clash; * changes the loading code so that it first tries to load certificates bundled with gRPC-C++ (versions 0.0.4 and 0.0.6+), but falls back to those bundled with Firestore if necessary. At a later point, Firestore should be changed to not bundle the certificates altogether.
This resolves the annoying Xcode errors that claim `FIRAppInternal.h` can't be found. It also makes it *much* easier to "Jump to definition" now.
Since the nanopb protos are now namespaced, we need to account for that in our serializer_test.cc file.
|
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the |
|
A Googler has manually verified that the CLAs look good. (Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since the nanopb protos are now namespaced, we need to account for that
in our serializer_test.cc file.