init

Author: cherylEnkidu

Firestore/Swift/Source/SwiftAPI/SwiftCppAPI.swift

@@ -0,0 +1,14 @@
+//
+//  SwiftCppAPI.swift
+//  Firebase
+//
+//  Created by Cheryl Lin on 2024-10-22.
+//
+
+import FirebaseFirestoreCpp
+
+public class SwiftCppWrapper {
+  init(_ value : String ){
+    _ = UsedBySwift(std.string(value))
+    }
+}

Firestore/core/CMakeLists.txt

@@ -218,6 +218,9 @@ firebase_ios_glob(
   src/objc/*.h
   src/remote/*.cc
   src/remote/*.h
+  swift/include/*.h
+  swift/src/*.cc
+  swift/umbrella/*.h
   EXCLUDE ${nanopb_sources}
 )
 

Firestore/core/swift/include/used_by_swift.h

@@ -0,0 +1,15 @@
+//
+// Created by Cheryl Lin on 2024-10-22.
+//
+
+#ifndef FIREBASE_USED_BY_SWIFT_H
+#define FIREBASE_USED_BY_SWIFT_H
+
+#include <string>
+
+class UsedBySwift {
+ public:
+  explicit UsedBySwift(std::string content);
+};
+
+#endif  // FIREBASE_USED_BY_SWIFT_H

Firestore/core/swift/src/used_by_swift.cc

@@ -0,0 +1,10 @@
+//
+// Created by Cheryl Lin on 2024-10-22.
+//
+
+#include "Firestore/core/swift/include/used_by_swift.h"
+#include <iostream>
+
+UsedBySwift::UsedBySwift(std::string content) {
+  std::cout << "ctor runs with value: " << content << std::endl;
+}

Firestore/core/swift/umbrella/FirebaseFirestoreCpp.h

@@ -0,0 +1,10 @@
+//
+// Created by Cheryl Lin on 2024-10-22.
+//
+
+#ifndef FIREBASE_FIREBASEFIRESTORECPP_H
+#define FIREBASE_FIREBASEFIRESTORECPP_H
+
+#import "../include/used_by_swift.h"
+
+#endif  // FIREBASE_FIREBASEFIRESTORECPP_H

Package.swift

@@ -476,7 +476,10 @@ let package = Package(
       dependencies: [
         "FirebaseFirestoreTarget",
       ],
-      path: "FirebaseCombineSwift/Sources/Firestore"
+      path: "FirebaseCombineSwift/Sources/Firestore",
+      swiftSettings: [
+          .interoperabilityMode(.Cxx), // C++ interoperability setting
+      ]
     ),
     .target(
       name: "FirebaseStorageCombineSwift",
@@ -1399,6 +1402,20 @@ func firestoreWrapperTarget() -> Target {
   )
 }
 
+func firebaseFirestoreCppTarget() -> Target {
+    return .target(
+        name: "FirebaseFirestoreCpp",
+        path: "Firestore/core/swift",
+        sources: [
+          "src",
+        ],
+        publicHeadersPath: "include", // Path to the public headers
+        cxxSettings: [
+          .headerSearchPath("umbrella"), // Ensure the header search path is correct
+        ]
+      )
+}
+
 func firestoreTargets() -> [Target] {
   if ProcessInfo.processInfo.environment["FIREBASE_SOURCE_FIRESTORE"] != nil {
     return [
@@ -1469,13 +1486,15 @@ func firestoreTargets() -> [Target] {
           .linkedLibrary("c++"),
         ]
       ),
+      firebaseFirestoreCppTarget(),
       .target(
         name: "FirebaseFirestore",
         dependencies: [
           "FirebaseCore",
           "FirebaseCoreExtension",
           "FirebaseFirestoreInternalWrapper",
           "FirebaseSharedSwift",
+          "FirebaseFirestoreCpp",
         ],
         path: "Firestore",
         exclude: [
@@ -1496,7 +1515,10 @@ func firestoreTargets() -> [Target] {
         sources: [
           "Swift/Source/",
         ],
-        resources: [.process("Source/Resources/PrivacyInfo.xcprivacy")]
+        resources: [.process("Source/Resources/PrivacyInfo.xcprivacy")],
+        swiftSettings: [
+          .interoperabilityMode(.Cxx), // C++ interoperability setting
+        ]
       ),
     ]
   }
@@ -1542,9 +1564,13 @@ func firestoreTargets() -> [Target] {
         "FirebaseCoreExtension",
         "leveldb",
         "FirebaseSharedSwift",
+        "FirebaseFirestoreCpp",
       ],
       path: "Firestore/Swift/Source",
       resources: [.process("Resources/PrivacyInfo.xcprivacy")],
+      swiftSettings: [
+          .interoperabilityMode(.Cxx), // C++ interoperability setting
+      ],
       linkerSettings: [
         .linkedFramework("SystemConfiguration", .when(platforms: [.iOS, .macOS, .tvOS])),
         .linkedFramework("UIKit", .when(platforms: [.iOS, .tvOS])),
@@ -1561,5 +1587,6 @@ func firestoreTargets() -> [Target] {
       publicHeadersPath: "."
     ),
     firestoreInternalTarget,
+    firebaseFirestoreCppTarget(),
   ]
 }