Skip to content

Conversation

mikelehen
Copy link
Contributor

I had to manually fix one conflict in .gitignore. All tests pass. When I merge, I'll do a normal merge, not squash.

wilhuff and others added 30 commits December 11, 2017 19:50
* Add abseil bits to the iOS build

* Migrate from prerelease to published abseil bits in ordered_code

* Remove prerelease abseil code
* Use Debug as the default build type if unspecified

* Add a leveldb ExternalProject, FindLevelDB module, and use it in Firestore

* Accept an externally built leveldb via LEVELDB_ROOT

* Clone leveldb via https: instead of git:

* Remove extra DOWNLOAD_DIR which doesn't work with GIT sources
Update CHANGELOG.md for Firebase Storage v2.1.1
* Add nullability check for completion handler

* Addresses comments

* added line break
Fixes indentation and removes unused imports.
* implement logger, apple impl and other impl, with test.

* some minor fixes

*   re-organize cmake build rules;
*   fix bugs in log_apple.mm;

* style fix by style.sh

* Complete removal of LogAssert
This fixes a race condition where a caller calls FIRSetLoggerLevel and
then checks FIRIsLoggableLevel immediately after.
* Add all .mm files in Firestore/core to the build (which matches
  log_apple.mm).
* Exclude log_stdio.cc
* Add log_test.cc to the project
* slight cleanup

* Use -D defines for versions

* Undo FIROptionsTest change

* Drop failed macro attempt

* Add correct version to podspec

* Add newline

* Shuffle files around

* Bring back log change

* Fix change

* Fix space
* Don't bother specifying a download directory to CMake ExternalProject
* Teach CMake to build pure Xcode projects as dependencies

  This allows downstream code (like log_apple.mm) to consume this for
  testing within the CMake build without requiring a CMake-native build
  for these components.

  This makes integrating these components into the cmake build essentially
  free from the point of view of the consumed component.

* Get the CMake build semi-working on Linux again

  Many prebuilt versions of cmake on Linux lack the ability to download
  over https so use git to get googletest.

  Don't attempt to build FirebaseCore on Linux; there's no xcodebuild.

  Note the build is still ultimately broken because we don't yet have an
  alternative to arc4random on Linux but at least this is no more broken
  than it was before.
* Deprecate FIRAppEnvironmentUtil sharedApplication

* Remove sharedApplication private API.

This also allows us to remove an AppKit dependency.

* Disable autolink when building FirebaseCore (#606)

This prevents the dependencies of FirebaseCore's dependencies from
bleeding into its interface.

The proximate benefit of avoiding this is that FirebaseCore no longer
ends up depending on ColorSync.framework which became a top-level system
framework in 10.13. This makes it possible to build against the
resulting FirebaseCore.framework on macOS 10.12 using Xcode 9 (with the
macOS 10.13 SDK).
* Rename FIREBASE_BINARY_DIR to FIREBASE_INSTALL_DIR

  Make this consistent with the outer superbuild and also make the
  association with CMAKE_INSTALL_PREFIX more obvious.

* Build and test log_stdio separate from the rest of util

  This is in preparation for adding a test for log_apple

* Build and test log_apple under CMake

  Also add notes about how FIRLogger's debug mode can break this test

* Refactor log_apple to cut down duplicate switch statements

  There's also a slight reduction in final binary size.
Add Community Supported tvOS for Core, Auth, Database and Storage.
Add tvOS unit tests
Add tvOS sample app
Update README.md
Add tvOS to travis testing
davidair and others added 9 commits January 8, 2018 10:41
* Removing an obsolete setting from plist files

* Fixing Unit Tests

* Fixing nullability
* Fully-qualify imports in the protocol compiler output

* pbxproj updates from running pod update

* New checked-in proto outputs
* Port StringPrintf from //base.

  Prefer this to approaches based on variadic templates. While the variadic
  template mechanisms are strictly safer, they result in binary bloat we
  can't afford.

  This is essentially the same StringPrintf previously open sourced as a
  part of protobuf, though updated for C++11 which saves a copy and a
  temporary buffer on the heap.

* Add abseil as a subdirectory of Firestore

  This saves having to redefine all the libraries that abseil defines as
  imported libraries.

* Rename firebase_firesture_util_log_* targets

  Cut the log out of the name to reflect that these will get more
  components besides just logging.
* implement C++ assert (stdio, apple)

* Update tests for firebase_firestore_util renames

* renaming `assert.h` to `firebase_assert.h`

* refactoring to a common `WrapNSStringNoCopy()`
@mikelehen mikelehen changed the base branch from master to firestore-api-changes January 9, 2018 23:21
Copy link
Contributor

@wilhuff wilhuff left a comment

Choose a reason for hiding this comment

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

LTGM

@firebase firebase deleted a comment from googlebot Jan 10, 2018
@mikelehen mikelehen merged commit d6bf54e into firestore-api-changes Jan 10, 2018
@mikelehen mikelehen deleted the mikelehen/merge-master-to-firestore-api-changes branch January 10, 2018 01:00
minafarid pushed a commit to minafarid/firebase-ios-sdk that referenced this pull request Jun 6, 2018
…to-firestore-api-changes

Merge master to firestore api changes
@firebase firebase locked and limited conversation to collaborators Nov 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.