Skip to content

Commit 7c7ac2e

Browse files
committed
add extern c
1 parent b84f3ec commit 7c7ac2e

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,16 @@
1919
NS_ASSUME_NONNULL_BEGIN
2020

2121
/** Returns the current version of Firebase. */
22+
23+
#ifdef __cplusplus
24+
extern "C" {
25+
#endif
26+
2227
NS_SWIFT_NAME(FirebaseVersion())
2328
NSString* FIRFirebaseVersion(void);
2429

30+
#ifdef __cplusplus
31+
}
32+
#endif
33+
2534
NS_ASSUME_NONNULL_END

Package.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ let package = Package(
478478
],
479479
path: "FirebaseCombineSwift/Sources/Firestore",
480480
swiftSettings: [
481-
.interoperabilityMode(.Cxx), // C++ interoperability setting
481+
.interoperabilityMode(.Cxx), // C++ interoperability setting
482482
]
483483
),
484484
.target(
@@ -1176,7 +1176,7 @@ let package = Package(
11761176
],
11771177
path: "SwiftPMTests/swift-test",
11781178
swiftSettings: [
1179-
.interoperabilityMode(.Cxx), // C++ interoperability setting
1179+
.interoperabilityMode(.Cxx), // C++ interoperability setting
11801180
]
11811181
),
11821182
.testTarget(
@@ -1406,14 +1406,14 @@ func firestoreWrapperTarget() -> Target {
14061406
}
14071407

14081408
func firebaseFirestoreCppTarget() -> Target {
1409-
return .target(
1410-
name: "FirebaseFirestoreCpp",
1411-
path: "Firestore/core/swift",
1412-
publicHeadersPath: "include", // Path to the public headers
1413-
cxxSettings: [
1414-
.headerSearchPath("umbrella"), // Ensure the header search path is correct
1415-
]
1416-
)
1409+
return .target(
1410+
name: "FirebaseFirestoreCpp",
1411+
path: "Firestore/core/swift",
1412+
publicHeadersPath: "include", // Path to the public headers
1413+
cxxSettings: [
1414+
.headerSearchPath("umbrella"), // Ensure the header search path is correct
1415+
]
1416+
)
14171417
}
14181418

14191419
func firestoreTargets() -> [Target] {
@@ -1569,7 +1569,7 @@ func firestoreTargets() -> [Target] {
15691569
path: "Firestore/Swift/Source",
15701570
resources: [.process("Resources/PrivacyInfo.xcprivacy")],
15711571
swiftSettings: [
1572-
.interoperabilityMode(.Cxx), // C++ interoperability setting
1572+
.interoperabilityMode(.Cxx), // C++ interoperability setting
15731573
],
15741574
linkerSettings: [
15751575
.linkedFramework("SystemConfiguration", .when(platforms: [.iOS, .macOS, .tvOS])),

0 commit comments

Comments
 (0)