thebrowsercompany · compnerd · Aug 4, 2023 · Aug 7, 2023 · Aug 17, 2023 · Aug 17, 2023
diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,10 @@
 
 # Top level CMake file that defines the entire Firebase C++ SDK build.
 
+if(POLICY CMP0141)
+  cmake_policy(SET CMP0141 NEW)
+endif()
+
 cmake_minimum_required (VERSION 3.1)
 
 set (CMAKE_CXX_STANDARD 14)

diff --git a/app/src/include/firebase/future.h b/app/src/include/firebase/future.h
@@ -407,6 +407,11 @@ class Future : public FutureBase {
   /// when you set up the callback.
   typedef void (*TypedCompletionCallback)(const Future<ResultType>& result_data,
                                           void* user_data);
+#if defined(__swift__)
+  // TODO(apple/swift#67662) indirect block parameters are unsupported
+  typedef void (*TypedCompletionCallback_SwiftWorkaround)(
+      const Future<ResultType>* result_data, void* user_data);
+#endif
 
   /// Construct a future.
   Future() {}
@@ -464,6 +469,16 @@ class Future : public FutureBase {
   inline void OnCompletion(TypedCompletionCallback callback,
                            void* user_data) const;
 
+#if defined(__swift__)
+  // TODO(apple/swift#67662) indirect block parameters are unsupported
+  inline void OnCompletion_SwiftWorkaround(
+      TypedCompletionCallback_SwiftWorkaround callback, void* user_data) const {
+    OnCompletion([callback, user_data](const Future<ResultType>& future) {
+      callback(&future, user_data);
+    });
+  }
+#endif
+
 #if defined(FIREBASE_USE_STD_FUNCTION) || defined(DOXYGEN)
   /// Register a single callback that will be called at most once, when the
   /// future is completed.

diff --git a/auth/CMakeLists.txt b/auth/CMakeLists.txt
@@ -51,6 +51,7 @@ build_flatbuffers("${flatbuffer_schemas}"
 # Common source files used by all platforms
 set(common_SRCS
     src/auth.cc
+    src/auth_swift.cc
     src/credential.cc
     src/common.cc
     src/common.h

diff --git a/auth/src/auth_swift.cc b/auth/src/auth_swift.cc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * 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.
+ */
+
+#define __swift__ 50000
+#include "auth/src/include/firebase/auth.h"
+
+#if FIREBASE_PLATFORM_WINDOWS
+namespace firebase {
+namespace auth {
+Auth::Auth(const Auth &) noexcept = default;
+}
+}  // namespace firebase
+#endif
diff --git a/auth/src/include/firebase/auth.h b/auth/src/include/firebase/auth.h
@@ -149,6 +149,13 @@ class Auth {
 
   ~Auth();
 
+#if defined(__swift__)
+#if FIREBASE_PLATFORM_WINDOWS
+  // TODO(apple/swift#67288) support trivial C++ types with non-trivial dtors
+  Auth(const Auth&) noexcept;
+#endif
+#endif
+
   /// Synchronously gets the cached current user, or returns an object where
   /// is_valid() == false if there is none.
   ///

diff --git a/build_scripts/windows/fix_cmake_debugflags.ps1 b/build_scripts/windows/fix_cmake_debugflags.ps1
@@ -0,0 +1,33 @@
+# Path to the CMakeLists.txt file
+$filePath = $args[0]
+
+# Lines to add after the line starting with "cmake_minimum_required"
+$newLines = @(
+    'string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")',
+    'string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")',
+    'string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")',
+    'string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")'
+)
+
+# Read the content of the file
+$content = Get-Content -Path $filePath
+
+# New content holder
+$newContent = @()
+
+# Flag to check if lines are added
+$linesAdded = $false
+
+foreach ($line in $content) {
+    # Add the current line to new content
+    $newContent += $line
+
+    # Check if the line starts with "cmake_minimum_required" and add new lines after it
+    if ($line -match '^cmake_minimum_required' -and -not $linesAdded) {
+        $newContent += $newLines
+        $linesAdded = $true
+    }
+}
+
+# Write the new content back to the file
+$newContent | Set-Content -Path $filePath
diff --git a/cmake/external_rules.cmake b/cmake/external_rules.cmake
@@ -235,6 +235,10 @@ function(build_external_dependencies)
   # Propagate the PIC setting, as the dependencies need to match it
   set(CMAKE_SUB_CONFIGURE_OPTIONS ${CMAKE_SUB_CONFIGURE_OPTIONS}
       -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE})
+  if(Python3_EXECUTABLE)
+    set(CMAKE_SUB_CONFIGURE_OPTIONS ${CMAKE_SUB_CONFIGURE_OPTIONS}
+      -DPython3_EXECUTABLE=${Python3_EXECUTABLE})
+  endif()
   message(STATUS "Sub-configure options: ${CMAKE_SUB_CONFIGURE_OPTIONS}")
   message(STATUS "Sub-build options: ${CMAKE_SUB_BUILD_OPTIONS}")
 

diff --git a/firestore/CMakeLists.txt b/firestore/CMakeLists.txt
@@ -35,6 +35,7 @@ set(common_SRCS
     src/common/field_path.cc
     src/common/field_value.cc
     src/common/firestore.cc
+    src/common/firestore_swift.cc
     src/common/firestore_exceptions_common.h
     src/common/futures.cc
     src/common/futures.h
@@ -352,7 +353,7 @@ if(IOS)
   set(FIREBASE_FIRESTORE_CORE_HEADER_DIR
     ${FIREBASE_POD_DIR}/Pods/FirebaseFirestoreInternal/Firestore/core/include
   )
-  
+
 else()
   # Desktop and Android get their public headers from the CMake build in
   # firebase-ios-sdk.

diff --git a/firestore/src/common/firestore_swift.cc b/firestore/src/common/firestore_swift.cc
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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.
+ */
+
+#define __swift__ 50000
+#include "firestore/src/include/firebase/firestore.h"
+
+#if FIREBASE_PLATFORM_WINDOWS
+namespace firebase {
+namespace firestore {
+Firestore::Firestore(const Firestore &) noexcept = default;
+}
+}  // namespace firebase
+#endif
diff --git a/firestore/src/include/firebase/firestore.h b/firestore/src/include/firebase/firestore.h
@@ -195,7 +195,15 @@ class Firestore {
    * Deleted copy constructor; Firestore must be created with
    * Firestore::GetInstance().
    */
+#if defined(__swift__)
+#if FIREBASE_PLATFORM_WINDOWS
+  Firestore(const Firestore& src) noexcept;
+#else
   Firestore(const Firestore& src) = delete;
+#endif
+#else
+  Firestore(const Firestore& src) = delete;
+#endif
 
   /**
    * Deleted copy assignment operator; Firestore must be created with

diff --git a/firestore/src/include/firebase/firestore/map_field_value.h b/firestore/src/include/firebase/firestore/map_field_value.h
@@ -31,6 +31,15 @@ using MapFieldValue = std::unordered_map<std::string, FieldValue>;
 /** @brief A map of `FieldValue`s indexed by field paths. */
 using MapFieldPathValue = std::unordered_map<FieldPath, FieldValue>;
 
+#if defined(__swift__)
+// Reference the following types so that they are included in the CXX
+// module. A workaround for deserialization cross reference compiler
+// crashes https://github.com/apple/swift/issues/70253
+using FieldValueVector = std::vector<FieldValue>;
+using FieldValueVectorConstIterator = std::_Vector_const_iterator<std::_Vector_val<std::_Simple_types<FieldValue>>>;
+using StringVectorConstIterator = std::vector<std::string>::const_iterator;
+#endif
+
 }  // namespace firestore
 }  // namespace firebase
 

diff --git a/scripts/git/patches/boringssl/0001-disable-warnings.patch b/scripts/git/patches/boringssl/0001-disable-warnings.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -197,6 +197,11 @@ elseif(MSVC)
+@@ -197,6 +197,14 @@ elseif(MSVC)
                # possible loss of data
        "C4244" # 'function' : conversion from 'int' to 'uint8_t',
                # possible loss of data
@@ -9,6 +9,9 @@
 +      "C4191" # 'operator/operation' : unsafe conversion from 'type of
 +              # expression' to 'type required'
 +      "C5264" # 'const' variable is not used
++      "C4746" # volatile access of 'label' is subject to /volatile:<iso|ms>
++              # setting; consider using __iso_volatile_load/store intrinsic
++              # functions
        "C4267" # conversion from 'size_t' to 'int', possible loss of data
        "C4371" # layout of class may have changed from a previous version of the
                # compiler due to better packing of member '...'