Delete Firestore public C++ API

CMakeLists.txt

@@ -88,13 +88,17 @@ add_subdirectory(
 set(BUILD_TESTING ${old_build_testing} CACHE BOOL "Restore BUILD_TESTING" FORCE)
 
 
+# Firebase C++
+find_package(firebase_cpp_sdk REQUIRED)
+
+
 # gRPC
-find_package(OpenSSL)
+find_package(OpenSSL QUIET)
 if(OPENSSL_FOUND)
   set(gRPC_SSL_PROVIDER package CACHE STRING "Use external OpenSSL")
 endif()
 
-find_package(ZLIB)
+find_package(ZLIB QUIET)
 if(ZLIB_FOUND)
   set(gRPC_ZLIB_PROVIDER package CACHE STRING "Use external ZLIB")
 endif()

Firestore/CMakeLists.txt

@@ -15,4 +15,5 @@
 add_subdirectory(Example/Benchmarks)
 add_subdirectory(Protos)
 add_subdirectory(core)
+add_subdirectory(cpp)
 add_subdirectory(fuzzing)

Firestore/core/include/firebase/firestore/CMakeLists.txt

@@ -16,9 +16,6 @@
 # (see https://stackoverflow.com/questions/27039019/ and open issue on CMake
 # issue tracker: https://gitlab.kitware.com/cmake/cmake/issues/15234)
 add_custom_target(firebase_firestore_types_ide SOURCES
-    document_reference.h
-    event_listener.h
-    firestore.h
     firestore_errors.h
     geo_point.h
     timestamp.h

Firestore/cpp/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright 2018 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_subdirectory(include/firebase/firestore)
+
+add_subdirectory(test)

Firestore/cpp/include/firebase/firestore/CMakeLists.txt

@@ -0,0 +1,40 @@
+# Copyright 2018 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Workaround to make the headers show up in IDEs
+# (see https://stackoverflow.com/questions/27039019/ and open issue on CMake
+# issue tracker: https://gitlab.kitware.com/cmake/cmake/issues/15234)
+add_custom_target(
+  firebase_firestore_ide
+  SOURCES
+    collection_reference.h
+    document_change.h
+    document_reference.h
+    document_snapshot.h
+    event_listener.h
+    field_path.h
+    field_value.h
+    firestore.h
+    listener_registration.h
+    map_field_value.h
+    metadata_changes.h
+    query.h
+    query_snapshot.h
+    set_options.h
+    settings.h
+    snapshot_metadata.h
+    source.h
+    transaction.h
+    write_batch.h
+)

Firestore/cpp/test/CMakeLists.txt

@@ -0,0 +1,21 @@
+# Copyright 2018 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cc_test(
+  firebase_firestore_cpp_test
+  SOURCES
+    firebase_app_test.cc
+  DEPENDS
+    firebase_app
+)

Firestore/cpp/test/firebase_app_test.cc

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2018 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <memory>
+
+#include "firebase/app.h"
+#include "gtest/gtest.h"
+
+using firebase::App;
+using firebase::AppOptions;
+
+TEST(FirebaseAppTest, TestCreate) {
+  AppOptions options;
+  std::unique_ptr<App> app{App::Create(options)};
+  ASSERT_NE(nullptr, app.get());
+  EXPECT_STREQ(firebase::kDefaultAppName, app->name());
+}

cmake/Findfirebase_cpp_sdk.cmake

@@ -0,0 +1,64 @@
+# Copyright 2018 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include(FindPackageHandleStandardArgs)
+
+find_path(
+  FIREBASE_CPP_SDK_DIR include/firebase/future.h
+  HINTS
+    $ENV{FIREBASE_CPP_SDK_DIR}
+    ${FIREBASE_BINARY_DIR}/external/src/firebase_cpp_sdk
+)
+
+find_path(
+  FIREBASE_CPP_INCLUDE_DIR firebase/future.h
+  PATHS
+    ${FIREBASE_CPP_SDK_DIR}/include
+)
+
+if(APPLE)
+  if("${CMAKE_OSX_SYSROOT}" MATCHES "iphoneos")
+    # iOS
+    set(FIREBASE_CPP_LIB_DIR ${FIREBASE_CPP_SDK_DIR}/libs/ios/${CMAKE_SYSTEM_PROCESSOR})
+  else()
+    set(FIREBASE_CPP_LIB_DIR ${FIREBASE_CPP_SDK_DIR}/libs/darwin/universal)
+  endif()
+endif()
+
+find_library(
+  FIREBASE_CPP_APP_LIBRARY
+  NAMES firebase_app
+  HINTS
+    ${FIREBASE_CPP_LIB_DIR}
+)
+
+find_package_handle_standard_args(
+  firebase_cpp_sdk
+  DEFAULT_MSG
+  FIREBASE_CPP_INCLUDE_DIR
+  FIREBASE_CPP_APP_LIBRARY
+)
+
+if(FIREBASE_CPP_SDK_FOUND)
+  set(FIREBASE_CPP_INCLUDE_DIRS ${FIREBASE_CPP_INCLUDE_DIR})
+
+  if (NOT TARGET firebase_app)
+    add_library(firebase_app UNKNOWN IMPORTED)
+    set_target_properties(
+      firebase_app PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES ${FIREBASE_CPP_INCLUDE_DIRS}
+      IMPORTED_LOCATION ${FIREBASE_CPP_APP_LIBRARY}
+    )
+  endif()
+endif(FIREBASE_CPP_SDK_FOUND)

cmake/external/CMakeLists.txt

@@ -24,6 +24,7 @@ set(
 )
 
 include(benchmark)
+include(firebase_cpp_sdk)
 include(googletest)
 include(grpc)
 include(leveldb)

cmake/external/firebase_cpp_sdk.cmake

@@ -0,0 +1,36 @@
+# Copyright 2018 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+include(ExternalProject)
+
+if(TARGET firebase_cpp_sdk)
+  return()
+endif()
+
+set(version 5.4.0)
+
+ExternalProject_Add(
+  firebase_cpp_sdk
+
+  DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
+  URL https://dl.google.com/firebase/sdk/cpp/firebase_cpp_sdk_${version}.zip
+  URL_HASH SHA256=e21302574a806ee6111e58eef9cf226ac61e2736bc98e7abee2b44fb41deaa6b
+
+  PREFIX ${PROJECT_BINARY_DIR}
+
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND     ""
+  INSTALL_COMMAND   ""
+  TEST_COMMAND      ""
+)