Revert "firebase: use bridging header and remove unnecessary header"

This reverts commit bb7ec5c.
thebrowsercompany · Feb 16, 2024 · e769cc4 · e769cc4
1 parent 7dce8b6
commit e769cc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
         include:
           - branch: development
             tag: DEVELOPMENT-SNAPSHOT-2024-02-08-a
-            options: -Xswiftc "-I${env:SDKROOT}\usr\lib\swift_static\windows" -Xswiftc "-I${env:SDKROOT}\..\..\..\..\..\..\Toolchains\0.0.0+Asserts\usr\include"
+            options: -Xswiftc "-I${env:SDKROOT}\usr\lib\swift_static\windows"
 
     name: Swift ${{ matrix.tag }}
 

diff --git a/Sources/firebase/include/FirebaseCore.hh b/Sources/firebase/include/FirebaseCore.hh
@@ -3,7 +3,7 @@
 
 #include <firebase/util.h>
 
-#include <swift/bridging>
+#include <stdio.h>
 
 namespace swift_firebase::swift_cxx_shims::firebase {
 
@@ -14,7 +14,7 @@ typedef void (*FutureCompletionType)(void*);
 // Swift. We can ignore the `FutureBase` param as the Swift caller can just
 // retain the Future as part of its closure.
 template <class R>
-class SWIFT_CONFORMS_TO_PROTOCOL(FirebaseCore.FutureProtocol)
+class __attribute__((swift_attr("conforms_to:FirebaseCore.FutureProtocol")))
   Future : public ::firebase::Future<R> {
  public:
   typedef R ResultType;