Use modulemap to fix exposure of FirebaseCore's internal headers (#121)

20 files changed, 34 insertions, 17 deletions

diff --git a/Firebase/Core/FirebaseCore.podspec b/Firebase/Core/FirebaseCore.podspec
index ca172b6..f78fe44 100644
--- a/Firebase/Core/FirebaseCore.podspec
+++ b/Firebase/Core/FirebaseCore.podspec
@@ -23,6 +23,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.osx.deployment_target = '10.10'
 
   s.source_files = '**/*.[mh]'
-  s.public_header_files = 'Firebase/Core/Public/*.h'
+  s.public_header_files = 'Firebase/Core/Public/*.h','Firebase/Core/Private/*.h'
+  s.private_header_files = 'Firebase/Core/Private/*.h'
   s.dependency 'GoogleToolboxForMac/NSData+zlib', '~> 2.1'
 end
diff --git a/Firebase/Database/Api/FIRDatabase.m b/Firebase/Database/Api/FIRDatabase.m
index 124b463..7466f4c 100644
--- a/Firebase/Database/Api/FIRDatabase.m
+++ b/Firebase/Database/Api/FIRDatabase.m
@@ -15,6 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
+#import "FIRLogger.h"
 #import "FIRDatabase.h"
 #import "FIRDatabase_Private.h"
 #import "FIRDatabaseQuery_Private.h"
diff --git a/Firebase/Database/Core/FPersistentConnection.m b/Firebase/Database/Core/FPersistentConnection.m
index 826b995..5f4de76 100644
--- a/Firebase/Database/Core/FPersistentConnection.m
+++ b/Firebase/Database/Core/FPersistentConnection.m
@@ -15,6 +15,7 @@
  */
 #import <Foundation/Foundation.h>
 
+#import "FIRLogger.h"
 #import <SystemConfiguration/SystemConfiguration.h>
 #import <netinet/in.h>
 #import <dlfcn.h>
diff --git a/Firebase/Database/Core/FRepo.m b/Firebase/Database/Core/FRepo.m
index bb176c0..8062933 100644
--- a/Firebase/Database/Core/FRepo.m
+++ b/Firebase/Database/Core/FRepo.m
@@ -16,6 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "FIRLogger.h"
 #import <dlfcn.h>
 #import "FRepo.h"
 #import "FSnapshotUtilities.h"
diff --git a/Firebase/Database/Core/FRepoManager.m b/Firebase/Database/Core/FRepoManager.m
index 6dccf7e..6a134d2 100644
--- a/Firebase/Database/Core/FRepoManager.m
+++ b/Firebase/Database/Core/FRepoManager.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FRepoManager.h"
 #import "FRepo.h"
 #import "FIRDatabaseQuery_Private.h"
diff --git a/Firebase/Database/Core/FSyncTree.m b/Firebase/Database/Core/FSyncTree.m
index 37100c1..1bbc606 100644
--- a/Firebase/Database/Core/FSyncTree.m
+++ b/Firebase/Database/Core/FSyncTree.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FSyncTree.h"
 #import "FListenProvider.h"
 #import "FWriteTree.h"
diff --git a/Firebase/Database/Core/Utilities/FIRRetryHelper.m b/Firebase/Database/Core/Utilities/FIRRetryHelper.m
index 199e17d..6d79159 100644
--- a/Firebase/Database/Core/Utilities/FIRRetryHelper.m
+++ b/Firebase/Database/Core/Utilities/FIRRetryHelper.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FIRRetryHelper.h"
 #import "FUtilities.h"
 
diff --git a/Firebase/Database/Core/View/FChildEventRegistration.m b/Firebase/Database/Core/View/FChildEventRegistration.m
index 6308a90..9d44ef5 100644
--- a/Firebase/Database/Core/View/FChildEventRegistration.m
+++ b/Firebase/Database/Core/View/FChildEventRegistration.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FChildEventRegistration.h"
 #import "FIRDatabaseQuery_Private.h"
 #import "FQueryParams.h"
diff --git a/Firebase/Database/Core/View/FValueEventRegistration.m b/Firebase/Database/Core/View/FValueEventRegistration.m
index d351a4b..f6baa52 100644
--- a/Firebase/Database/Core/View/FValueEventRegistration.m
+++ b/Firebase/Database/Core/View/FValueEventRegistration.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FValueEventRegistration.h"
 #import "FIRDatabaseQuery_Private.h"
 #import "FQueryParams.h"
diff --git a/Firebase/Database/Login/FAuthTokenProvider.m b/Firebase/Database/Login/FAuthTokenProvider.m
index d1207c6..f3c2a61 100644
--- a/Firebase/Database/Login/FAuthTokenProvider.m
+++ b/Firebase/Database/Login/FAuthTokenProvider.m
@@ -16,6 +16,7 @@
 
 #import "FAuthTokenProvider.h"
 #import "FUtilities.h"
+#import "FIRLogger.h"
 #import "FIRDatabaseQuery_Private.h"
 #import "FIRNoopAuthTokenProvider.h"
 
diff --git a/Firebase/Database/Persistence/FLevelDBStorageEngine.m b/Firebase/Database/Persistence/FLevelDBStorageEngine.m
index 2eb007a..22d67ad 100644
--- a/Firebase/Database/Persistence/FLevelDBStorageEngine.m
+++ b/Firebase/Database/Persistence/FLevelDBStorageEngine.m
@@ -18,6 +18,7 @@
 
 #import "FLevelDBStorageEngine.h"
 
+#import "FIRLogger.h"
 #import "APLevelDB.h"
 #import "FSnapshotUtilities.h"
 #import "FWriteRecord.h"
diff --git a/Firebase/Database/Persistence/FPersistenceManager.m b/Firebase/Database/Persistence/FPersistenceManager.m
index fb38192..0ae75b3 100644
--- a/Firebase/Database/Persistence/FPersistenceManager.m
+++ b/Firebase/Database/Persistence/FPersistenceManager.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FPersistenceManager.h"
 #import "FLevelDBStorageEngine.h"
 #import "FCacheNode.h"
diff --git a/Firebase/Database/Persistence/FTrackedQueryManager.m b/Firebase/Database/Persistence/FTrackedQueryManager.m
index bf9753d..9673fb7 100644
--- a/Firebase/Database/Persistence/FTrackedQueryManager.m
+++ b/Firebase/Database/Persistence/FTrackedQueryManager.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FTrackedQueryManager.h"
 #import "FImmutableTree.h"
 #import "FLevelDBStorageEngine.h"
diff --git a/Firebase/Database/Realtime/FConnection.m b/Firebase/Database/Realtime/FConnection.m
index 53f434c..50756e6 100644
--- a/Firebase/Database/Realtime/FConnection.m
+++ b/Firebase/Database/Realtime/FConnection.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FConnection.h"
 #import "FConstants.h"
 
diff --git a/Firebase/Database/Realtime/FWebSocketConnection.m b/Firebase/Database/Realtime/FWebSocketConnection.m
index 5cd8bb0..fe90344 100644
--- a/Firebase/Database/Realtime/FWebSocketConnection.m
+++ b/Firebase/Database/Realtime/FWebSocketConnection.m
@@ -18,6 +18,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "FIRLogger.h"
 #import "FWebSocketConnection.h"
 #import "FConstants.h"
 #import "FIRDatabaseReference.h"
diff --git a/Firebase/Database/Utilities/FUtilities.h b/Firebase/Database/Utilities/FUtilities.h
index f5e312f..f7fe7a5 100644
--- a/Firebase/Database/Utilities/FUtilities.h
+++ b/Firebase/Database/Utilities/FUtilities.h
@@ -15,7 +15,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRLogger.h"
 #import "FParsedUrl.h"
 
 @interface FUtilities : NSObject
diff --git a/Firebase/Database/Utilities/FUtilities.m b/Firebase/Database/Utilities/FUtilities.m
index 93b892a..befe874 100644
--- a/Firebase/Database/Utilities/FUtilities.m
+++ b/Firebase/Database/Utilities/FUtilities.m
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import "FIRLogger.h"
 #import "FUtilities.h"
 #import "FStringUtilities.h"
 #import "FConstants.h"
diff --git a/Firebase/Firebase/Firebase.h b/Firebase/Firebase/FirebaseCommunity.h
index f74e49f..ee37a76 100644
--- a/Firebase/Firebase/Firebase.h
+++ b/Firebase/Firebase/FirebaseCommunity.h
@@ -18,28 +18,24 @@
   #error "Firebase.h won't import anything if your compiler doesn't support __has_include. Please \
           import the headers individually."
 #else
-  #if __has_include(<Firebase/FirebaseCore.h>)
-    #import <Firebase/FirebaseCore.h>
+  #if __has_include(<FirebaseCommunity/FirebaseCore.h>)
+    #import <FirebaseCommunity/FirebaseCore.h>
   #endif
 
   #if __has_include(<FirebaseAnalytics/FirebaseAnalytics.h>)
     #import <FirebaseAnalytics/FirebaseAnalytics.h>
   #endif
 
-  #if __has_include(<FirebaseAppIndexing/FirebaseAppIndexing.h>)
-    #import <FirebaseAppIndexing/FirebaseAppIndexing.h>
-  #endif
-
-  #if __has_include(<Firebase/FirebaseAuth.h>)
-    #import <Firebase/FirebaseAuth.h>
+  #if __has_include(<FirebaseCommunity/FirebaseAuth.h>)
+    #import <FirebaseCommunity/FirebaseAuth.h>
   #endif
 
   #if __has_include(<FirebaseCrash/FirebaseCrash.h>)
     #import <FirebaseCrash/FirebaseCrash.h>
   #endif
 
-  #if __has_include(<Firebase/FirebaseDatabase.h>)
-    #import <Firebase/FirebaseDatabase.h>
+  #if __has_include(<FirebaseCommunity/FirebaseDatabase.h>)
+    #import <FirebaseCommunity/FirebaseDatabase.h>
   #endif
 
   #if __has_include(<FirebaseDynamicLinks/FirebaseDynamicLinks.h>)
@@ -54,16 +50,16 @@
     #import <FirebaseInvites/FirebaseInvites.h>
   #endif
 
-  #if __has_include(<Firebase/FirebaseMessaging.h>)
-    #import <Firebase/FirebaseMessaging.h>
+  #if __has_include(<FirebaseCommunity/FirebaseMessaging.h>)
+    #import <FirebaseCommunity/FirebaseMessaging.h>
   #endif
 
   #if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>)
     #import <FirebaseRemoteConfig/FirebaseRemoteConfig.h>
   #endif
 
-  #if __has_include(<Firebase/FirebaseStorage.h>)
-    #import <Firebase/FirebaseStorage.h>
+  #if __has_include(<FirebaseCommunity/FirebaseStorage.h>)
+    #import <FirebaseCommunity/FirebaseStorage.h>
   #endif
 
   #if __has_include(<GoogleMobileAds/GoogleMobileAds.h>)
diff --git a/Firebase/Firebase/module.modulemap b/Firebase/Firebase/module.modulemap
new file mode 100644
index 0000000..8e6c477
--- /dev/null
+++ b/Firebase/Firebase/module.modulemap
@@ -0,0 +1,6 @@
+framework module FirebaseCommunity {
+  umbrella header "FirebaseCommunity.h"
+
+  export *
+  module * { export * }
+}
diff --git a/Firebase/Storage/FIRStorageTokenAuthorizer.m b/Firebase/Storage/FIRStorageTokenAuthorizer.m
index 36b94a9..b90dd3f 100644
--- a/Firebase/Storage/FIRStorageTokenAuthorizer.m
+++ b/Firebase/Storage/FIRStorageTokenAuthorizer.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "../../Firebase/Core/Private/FIRAppInternal.h"
+#import "FIRAppInternal.h"
 
 #import "FIRStorageTokenAuthorizer.h"