cherylEnkidu vor 1 Jahr
Ursprung
Commit
19cdc822ec
2 geänderte Dateien mit 20 neuen und 11 gelöschten Zeilen
  1. 9 0
      FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h
  2. 11 11
      Package.swift

+ 9 - 0
FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h

@@ -19,7 +19,16 @@
 NS_ASSUME_NONNULL_BEGIN
 
 /** Returns the current version of Firebase. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 NS_SWIFT_NAME(FirebaseVersion())
 NSString* FIRFirebaseVersion(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 NS_ASSUME_NONNULL_END

+ 11 - 11
Package.swift

@@ -479,7 +479,7 @@ let package = Package(
       ],
       path: "FirebaseCombineSwift/Sources/Firestore",
       swiftSettings: [
-          .interoperabilityMode(.Cxx), // C++ interoperability setting
+        .interoperabilityMode(.Cxx), // C++ interoperability setting
       ]
     ),
     .target(
@@ -1177,7 +1177,7 @@ let package = Package(
       ],
       path: "SwiftPMTests/swift-test",
       swiftSettings: [
-          .interoperabilityMode(.Cxx), // C++ interoperability setting
+        .interoperabilityMode(.Cxx), // C++ interoperability setting
       ]
     ),
     .testTarget(
@@ -1399,14 +1399,14 @@ func firestoreWrapperTarget() -> Target {
 }
 
 func firebaseFirestoreCppTarget() -> Target {
-    return .target(
-        name: "FirebaseFirestoreCpp",
-        path: "Firestore/core/swift",
-        publicHeadersPath: "include", // Path to the public headers
-        cxxSettings: [
-          .headerSearchPath("umbrella"), // Ensure the header search path is correct
-        ]
-      )
+  return .target(
+    name: "FirebaseFirestoreCpp",
+    path: "Firestore/core/swift",
+    publicHeadersPath: "include", // Path to the public headers
+    cxxSettings: [
+      .headerSearchPath("umbrella"), // Ensure the header search path is correct
+    ]
+  )
 }
 
 func firestoreTargets() -> [Target] {
@@ -1562,7 +1562,7 @@ func firestoreTargets() -> [Target] {
       path: "Firestore/Swift/Source",
       resources: [.process("Resources/PrivacyInfo.xcprivacy")],
       swiftSettings: [
-          .interoperabilityMode(.Cxx), // C++ interoperability setting
+        .interoperabilityMode(.Cxx), // C++ interoperability setting
       ],
       linkerSettings: [
         .linkedFramework("SystemConfiguration", .when(platforms: [.iOS, .macOS, .tvOS])),