Skip to content

Commit cbfcb8a

Browse files
authored
style.sh && merge master (#2023)
* Update versions for Release 5.11.0 * Update Firestore Generated Protos (#1972) * Remove cruft from project file (#1975) * Lock reads and writes to session map * Changed FDL to use compatible __typeof__() operator. (#1982) 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 * Changed FDL to use compatible __typeof__() operator. (#1982) 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 * Bump DynamicLinks patch version * Add FDL to release manifest * Bump GoogleUtilities patch version to deliver fix for #1964 (#1987) * Wrap diagnostics notification in collection flag check. (#1979) * 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. * Queue Storage Tasks on separate queue (#1981) * Increase timeout for testDispatchAfterDelay (#1988) * Update Storage Changelog (#1989) * Add missing FirebaseStorage release note (#1990) * Allow semicolon in file name (#1991) * Remove unnecessary notification flag (#1993) * 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. (#1995) * 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. * Comply with c99 standard (#1992) * Trigger travis for Firestore podspec changes * Use C99-compatible __typeof__ instead of typeof (#1985) `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. * Adding AppCode Diff (#1996) * Remove warning (#1999) * Add InAppMessaging to Carthage template (#2006) * Restore SafariServices framework (#2002) * SafariServices not available on tvOS and not used on osx * Force Firestore to conform to C99 and C++11. (#2001) Note that c++0x is how Xcode spells c++11. Also fix an issue where we were accidentally using a C++14 feature. * Changing the internal testing repo (#2003) * Clean up test. The issue has already been fixed and we are now running integration test with actual server instead of hexa. (#2007) * gRPC: replace Objective-C implementation with the new C++ implementation (#1968) * add support for SSL disabled to `GrpcConnection` (unfortunately, there currently is no way to verify this change actually works); * make gRPC calls using the C++ implementation: * make `FSTRemoteStore` create C++ streams instead of their Objective-C counterparts; * port firebase/firebase-js-sdk#1041: streams are now never recreated, only restarted; * make `FSTDatastore` delegate server calls to the C++ implementation; * port `MockWatchStream` and `MockWriteStream` to C++ (`FSTMockDatastore` is still in place, because `Datastore` is not fully ported yet); * no longer generate Objective-C gRPC service definitions from protos; * remove all references to Objective-C gRPC client; * check in gRPC root certificates file and load it at runtime (the check-in part is temporary until gRPC-C++.podspec provides the certificate). This makes SSL work. * Add component system documentation. * Fixed markdown layout issue. * Remove trailing whitespaces. * Add table of contents. * Remove extra parentheses from TOC. * Renamed SDKs to frameworks and products for accuracy. * Updated the Carthage installation instructions (#2012) * Add Rome instructions (#2014) * Attempt to fix frequent Auth Unit Test flake on OSX (#2017) * Increase timeouts in attempt to eliminate travis flakes (#2016) * Don't rely on test always being in foreground (#2021) * Fix log overflow in continuous fuzz testing (#2020) Prevent generating too many "Unrecognized selector" console messages that eventually make Travis kill the job due to log exceeding limits. * style.sh
1 parent fe7e4a1 commit cbfcb8a

File tree

118 files changed

+7492
-3870
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+7492
-3870
lines changed

Carthage.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
## Context
44

55
This page introduces and provides instructions for an **experimental** Firebase
6-
[Carthage](https://github.com/Carthage/Carthage) implementation. Based on
7-
feedback and usage, the Firebase team may decide to make the Carthage
8-
distribution official.
6+
[Carthage](https://github.com/Carthage/Carthage) distribution. Based on
7+
feedback and usage, the Firebase team may decide to [make the Carthage
8+
distribution official](https://github.com/firebase/firebase-ios-sdk/issues/1862).
99

1010
Please [let us know](https://github.com/firebase/firebase-ios-sdk/issues) if you
11-
have suggestions about how best to distribute Carthage binaries that include
12-
resource bundles.
11+
have suggestions or questions.
1312

1413
## Carthage Installation
1514

@@ -28,7 +27,7 @@ more details and additional installation methods.
2827

2928
- Create a Cartfile with a **subset** of the following components - choosing the
3029
Firebase components that you want to include in your app. Note that
31-
**FirebaseAnalytics** must always be included.
30+
**FirebaseAnalyticsBinary** must always be included.
3231
```
3332
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseABTestingBinary.json"
3433
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAdMobBinary.json"
@@ -39,6 +38,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.js
3938
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDynamicLinksBinary.json"
4039
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json"
4140
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json"
41+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingBinary.json"
42+
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInAppMessagingDisplayBinary.json"
4243
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInvitesBinary.json"
4344
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMessagingBinary.json"
4445
binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLModelInterpreterBinary.json"
@@ -55,8 +56,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.jso
5556
- Use Finder to open `Carthage/Build/iOS`.
5657
- Copy the contents into the top level of your Xcode project and make sure
5758
they're added to the right build target(s).
58-
- Add the -ObjC flag to "Other Linker Flags".
59-
- Make sure that the build target(s) includes your project's `GoogleService-Info.plist`.
59+
- Add `$(OTHER_LDFLAGS) -ObjC` flag to "Other Linker Flags" in "Build Settings".
60+
- Make sure that the build target(s) includes your project's `GoogleService-Info.plist` ([how to download config file](https://support.google.com/firebase/answer/7015592))
6061
- [Delete Firebase.framework from the Link Binary With Libraries Build Phase](https://github.com/firebase/firebase-ios-sdk/issues/911#issuecomment-372455235).
6162
- If you're including a Firebase component that has resources, copy its bundles
6263
into the Xcode project and make sure they're added to the

Example/Auth/Tests/FIRAuthDispatcherTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@brief The maximum difference between time intervals (in seconds), after which they will be
2323
considered different.
2424
*/
25-
static const NSTimeInterval kMaxDifferenceBetweenTimeIntervals = 0.1;
25+
static const NSTimeInterval kMaxDifferenceBetweenTimeIntervals = 0.3;
2626

2727
/** @var kTestDelay
2828
@brief Fake time delay before tasks are dispatched.

0 commit comments

Comments
 (0)