samedson пре 3 година
родитељ
комит
b84bc95e79

+ 1 - 1
FirebaseCrashlytics.podspec

@@ -34,7 +34,7 @@ Pod::Spec.new do |s|
     'FirebaseCore/Extension/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
     'Interop/Analytics/Public/*.h',
-    # TODO(b/264274170) Remove Interop when FirebaseSessions releases and move to
+    # TODO(b/264274170) Remove Internal when FirebaseSessions releases and move to
     # FirebaseSessions.swift
     'FirebaseSessions/Internal/*.h',
   ]

+ 2 - 2
FirebaseSessions.podspec

@@ -37,9 +37,9 @@ Pod::Spec.new do |s|
   s.source_files = [
     base_dir + 'Sources/**/*.{swift}',
     base_dir + 'SourcesObjC/**/*.{c,h,m,mm}',
-    # TODO(b/264274170) Remove Interop when FirebaseSessions releases and move to
+    # TODO(b/264274170) Remove Internal when FirebaseSessions releases and move to
     # FirebaseSessions.swift
-    base_dir + 'Interop/*.h',
+    base_dir + 'Internal/*.h',
   ]
 
   s.dependency 'FirebaseCore', '~> 10.0'

+ 1 - 1
FirebaseSessions/Internal/FIRSessionsProvider.h

@@ -41,7 +41,7 @@ NS_SWIFT_NAME(SessionsSubscriber)
 /// dependency. To make SDKs that depend on FirebaseSessions build,
 /// we're defining this header in Objective-C and including it in all places.
 ///
-/// TODO(b/264274170) Remove Interop when FirebaseSessions releases and move to
+/// TODO(b/264274170) Remove Internal when FirebaseSessions releases and move to
 /// FirebaseSessions.swift
 NS_SWIFT_NAME(SessionsProvider)
 @protocol FIRSessionsProvider

+ 2 - 0
FirebaseSessions/SourcesObjC/FirebaseSessionsInternal.h

@@ -18,10 +18,12 @@
 
 #import <Foundation/Foundation.h>
 
+#if SWIFT_PACKAGE
 // This header is necessary for including the Interop header
 // in the Swift part of the codebase under Swift Package Manager
 // TODO(b/264274170) Remove the interop and make the dependency direct
 #import "FirebaseSessions/Internal/FIRSessionsProvider.h"
+#endif  // SWIFT_PACKAGE
 
 NS_ASSUME_NONNULL_BEGIN