From 9e22b3bb77c2532be4fb7389a3adbde850ea555b Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 19 Oct 2023 19:54:28 -0400 Subject: [PATCH 1/6] [Firestore] Follow-up review items from #11954 --- Firestore/Example/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index 6ac7eead24b..2a538fd37e6 100644 --- a/Firestore/Example/Podfile +++ b/Firestore/Example/Podfile @@ -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 From aa797266d9615c0f627ff43521f5ad114fe02d39 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 19 Oct 2023 17:18:49 -0400 Subject: [PATCH 2/6] [skip ci] Comment fix --- Firestore/Swift/Source/SwiftHeaderWorkaround.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firestore/Swift/Source/SwiftHeaderWorkaround.swift b/Firestore/Swift/Source/SwiftHeaderWorkaround.swift index 3ef3235272f..253beeae2bf 100644 --- a/Firestore/Swift/Source/SwiftHeaderWorkaround.swift +++ b/Firestore/Swift/Source/SwiftHeaderWorkaround.swift @@ -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 From b665b8b7a2ca688acbaf38040f7d8bc5aa17d135 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 19 Oct 2023 19:59:00 -0400 Subject: [PATCH 3/6] [skip ci] Related comment fix for RTDB --- .../Swift/Sources/SPMSwiftHeaderWorkaround.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift b/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift index 4397eea906e..7e418fb6c13 100644 --- a/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift +++ b/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift @@ -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) From 12db9a355f0dd9cb24dd7e998d8252ec9f5aa0a8 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Thu, 19 Oct 2023 20:00:29 -0400 Subject: [PATCH 4/6] Related comment fix for FIAM --- .../Swift/Source/SPMSwiftHeaderWorkaround.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift b/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift index bc130b67b0b..608e89ba4e0 100644 --- a/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift +++ b/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift @@ -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 a 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) From 74e798940fe0a9c0524707607eef279af31db19b Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:38:37 -0400 Subject: [PATCH 5/6] Add release tooling fix --- ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift index dca0dfad634..5dbdc636546 100755 --- a/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift +++ b/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift @@ -47,7 +47,7 @@ struct ModuleMapBuilder { """ - if module == "FirebaseFirestore" { + if module == "FirebaseFirestoreInternal" { content += """ link framework "BoringSSL-GRPC" link framework "gRPC-Core" From 510672fff6ce2fa04137b9b8899802a4e8693c48 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:46:32 -0400 Subject: [PATCH 6/6] Review --- .../Swift/Source/SPMSwiftHeaderWorkaround.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift b/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift index 608e89ba4e0..c84084917f3 100644 --- a/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift +++ b/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift @@ -17,7 +17,7 @@ // 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 In App + // 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 In App Messaging's Objective-C API