Skip to content

Commit

Permalink
[Firestore] Follow-up review items from #11954 (#11970)
Browse files Browse the repository at this point in the history
  • Loading branch information
ncooke3 authored Oct 20, 2023
1 parent 3e4b721 commit 4b26b31
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

// This is a trick to force generate a `FirebaseDatabase-Swift.h`
// header that re-exports `FirebaseDatabaseInternal` for Objective-C
// clients. It is important for the below code to reference a Remote
// Config symbol defined in Objective-C as that will import the symbol's
// clients. It is important for the below code to reference a Database
// symbol defined in Objective-C as that will import the symbol's
// module (`FirebaseDatabaseInternal`) in the generated header. This
// allows Objective-C clients to import Remote Config's Objective-C API
// allows Objective-C clients to import Database's Objective-C API
// using `@import FirebaseDatabase;`. This API is not needed for Swift
// clients and is therefore unavailable in a Swift context.
@available(*, unavailable)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

// This is a trick to force generate a `FirebaseInAppMessaging-Swift.h`
// header that re-exports `FirebaseInAppMessagingInternal` for Objective-C
// clients. It is important for the below code to reference a Remote
// Config symbol defined in Objective-C as that will import the symbol's
// clients. It is important for the below code to reference an In App
// Messaging symbol defined in Objective-C as that will import the symbol's
// module (`FirebaseInAppMessagingInternal`) in the generated header. This
// allows Objective-C clients to import Remote Config's Objective-C API
// allows Objective-C clients to import In App Messaging's Objective-C API
// using `@import FirebaseInAppMessaging;`. This API is not needed for Swift
// clients and is therefore unavailable in a Swift context.
@available(*, unavailable)
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ end
# required.
def configure_local_pods()
# Firestore is always local; that's what's under development here.
pod 'FirebaseFirestore', :path => '../../'
pod 'FirebaseFirestore', :path => '../..'

# FirebaseCore must always be a local pod so that CI builds that make changes
# to its podspec can still function. See Firestore-*-xcodebuild in
Expand Down
4 changes: 2 additions & 2 deletions Firestore/Swift/Source/SwiftHeaderWorkaround.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

// This is a trick to force generate a `FirebaseFirestore-Swift.h`
// header that re-exports `FirebaseFirestoreInternal` for Objective-C
// clients. It is important for the below code to reference a Remote
// Config symbol defined in Objective-C as that will import the symbol's
// clients. It is important for the below code to reference a Firestore
// symbol defined in Objective-C as that will import the symbol's
// module (`FirebaseFirestoreInternal`) in the generated header. This
// allows Objective-C clients to import Firestore's Objective-C API
// using `@import FirebaseFirestore;`. This API is not needed for Swift
Expand Down
2 changes: 1 addition & 1 deletion ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct ModuleMapBuilder {
"""

if module == "FirebaseFirestore" {
if module == "FirebaseFirestoreInternal" {
content += """
link framework "BoringSSL-GRPC"
link framework "gRPC-Core"
Expand Down

0 comments on commit 4b26b31

Please sign in to comment.