RTDB - new public header structure (#6171)

paulb777 · web-flow · commit a995dc4f5994 · 2020-07-31T07:22:02.000-07:00
diff --git a/Dangerfile b/Dangerfile
@@ -82,7 +82,7 @@ has_license_changes = didModify(["LICENSE"])
 @has_crashlytics_changes = hasChangesIn("Crashlytics/")
 @has_crashlytics_api_changes = hasChangesIn("Crashlytics/Crashlytics/Public/")
 @has_database_changes = hasChangesIn("FirebaseDatabase/")
-@has_database_api_changes = hasChangesIn("FirebaseDatabase/Public/")
+@has_database_api_changes = hasChangesIn("FirebaseDatabase/Sources/Public/")
 @has_dynamiclinks_changes = hasChangesIn("FirebaseDynamicLinks/")
 @has_dynamiclinks_api_changes = hasChangesIn("FirebaseDynamicLinks/Sources/Public/")
 @has_firestore_changes = hasChangesIn("Firestore/")
diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec
@@ -32,7 +32,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
     'Interop/Auth/Public/*.h',
     'FirebaseCore/Sources/Private/*.h',
   ]
-  s.public_header_files = base_dir + 'Public/*.h'
+  s.public_header_files = base_dir + 'Public/FirebaseDatabase/*.h'
   s.libraries = ['c++', 'icucore']
   s.frameworks = 'CFNetwork', 'Security', 'SystemConfiguration'
   s.dependency 'leveldb-library', '~> 1.22'
diff --git a/FirebaseDatabase/Sources/Api/FIRDataSnapshot.m b/FirebaseDatabase/Sources/Api/FIRDataSnapshot.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRDataSnapshot.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataSnapshot.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h"
 #import "FirebaseDatabase/Sources/FTransformedEnumerator.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Snapshot/FChildrenNode.h"
 #import "FirebaseDatabase/Sources/Utilities/FValidation.h"
 
diff --git a/FirebaseDatabase/Sources/Api/FIRDatabase.m b/FirebaseDatabase/Sources/Api/FIRDatabase.m
@@ -25,7 +25,7 @@
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h"
 #import "FirebaseDatabase/Sources/Core/FRepoInfo.h"
 #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabase.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h"
 #import "FirebaseDatabase/Sources/Utilities/FValidation.h"
 
 @implementation FIRDatabase
diff --git a/FirebaseDatabase/Sources/Api/FIRDatabaseQuery.m b/FirebaseDatabase/Sources/Api/FIRDatabaseQuery.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h"
 #import "FirebaseDatabase/Sources/Constants/FConstants.h"
 #import "FirebaseDatabase/Sources/Core/FQueryParams.h"
diff --git a/FirebaseDatabase/Sources/Api/FIRMutableData.m b/FirebaseDatabase/Sources/Api/FIRMutableData.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRMutableData.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRMutableData.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRMutableData_Private.h"
 #import "FirebaseDatabase/Sources/Core/FSnapshotHolder.h"
 #import "FirebaseDatabase/Sources/FNamedNode.h"
diff --git a/FirebaseDatabase/Sources/Api/FIRServerValue.m b/FirebaseDatabase/Sources/Api/FIRServerValue.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRServerValue.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRServerValue.h"
 
 @implementation FIRServerValue
 
diff --git a/FirebaseDatabase/Sources/Api/FIRTransactionResult.m b/FirebaseDatabase/Sources/Api/FIRTransactionResult.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRTransactionResult.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRTransactionResult_Private.h"
 
 @implementation FIRTransactionResult
diff --git a/FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h b/FirebaseDatabase/Sources/Api/Private/FIRDataSnapshot_Private.h
@@ -15,7 +15,7 @@
  */
 
 #import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataSnapshot.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataSnapshot.h"
 #import "FirebaseDatabase/Sources/Snapshot/FIndexedNode.h"
 
 @interface FIRDataSnapshot ()
diff --git a/FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h b/FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h
@@ -19,7 +19,7 @@
 #import "FirebaseDatabase/Sources/Core/FRepo.h"
 #import "FirebaseDatabase/Sources/Core/FRepoManager.h"
 #import "FirebaseDatabase/Sources/Core/Utilities/FPath.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h"
 
 @interface FIRDatabaseQuery ()
 
diff --git a/FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h b/FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h
@@ -17,7 +17,7 @@
 #import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h"
 #import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
 #import "FirebaseDatabase/Sources/Core/FRepo.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 
 @interface FIRDatabaseReference ()
 
diff --git a/FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h b/FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRDatabase.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h"
 
 @class FRepo;
 @class FRepoInfo;
diff --git a/FirebaseDatabase/Sources/Api/Private/FIRMutableData_Private.h b/FirebaseDatabase/Sources/Api/Private/FIRMutableData_Private.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRMutableData.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRMutableData.h"
 #import "FirebaseDatabase/Sources/Snapshot/FNode.h"
 
 @interface FIRMutableData ()
diff --git a/FirebaseDatabase/Sources/Api/Private/FIRTransactionResult_Private.h b/FirebaseDatabase/Sources/Api/Private/FIRTransactionResult_Private.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRMutableData.h"
-#import "FirebaseDatabase/Sources/Public/FIRTransactionResult.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRMutableData.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h"
 
 @interface FIRTransactionResult ()
 
diff --git a/FirebaseDatabase/Sources/Core/FListenProvider.m b/FirebaseDatabase/Sources/Core/FListenProvider.m
@@ -15,7 +15,7 @@
  */
 
 #import "FirebaseDatabase/Sources/Core/FListenProvider.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h"
 
 @implementation FListenProvider
 
diff --git a/FirebaseDatabase/Sources/Core/FPersistentConnection.m b/FirebaseDatabase/Sources/Core/FPersistentConnection.m
@@ -28,7 +28,7 @@
 #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
 #import "FirebaseDatabase/Sources/FIndex.h"
 #import "FirebaseDatabase/Sources/Login/FAuthTokenProvider.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"
 #import "FirebaseDatabase/Sources/Utilities/FAtomicNumber.h"
 #import "FirebaseDatabase/Sources/Utilities/FUtilities.h"
diff --git a/FirebaseDatabase/Sources/Core/FRepo.h b/FirebaseDatabase/Sources/Core/FRepo.h
@@ -16,7 +16,7 @@
 
 #import "FirebaseDatabase/Sources/Core/FPersistentConnection.h"
 #import "FirebaseDatabase/Sources/Core/FRepoInfo.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataEventType.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h"
 #import "FirebaseDatabase/Sources/Utilities/Tuples/FTupleUserCallback.h"
 #import <Foundation/Foundation.h>
 
diff --git a/FirebaseDatabase/Sources/Core/FRepo.m b/FirebaseDatabase/Sources/Core/FRepo.m
@@ -41,9 +41,9 @@
 #import "FirebaseDatabase/Sources/Persistence/FCachePolicy.h"
 #import "FirebaseDatabase/Sources/Persistence/FLevelDBStorageEngine.h"
 #import "FirebaseDatabase/Sources/Persistence/FPersistenceManager.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataSnapshot.h"
-#import "FirebaseDatabase/Sources/Public/FIRMutableData.h"
-#import "FirebaseDatabase/Sources/Public/FIRTransactionResult.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataSnapshot.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRMutableData.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h"
 #import "FirebaseDatabase/Sources/Snapshot/FEmptyNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"
 #import "FirebaseDatabase/Sources/Utilities/FAtomicNumber.h"
diff --git a/FirebaseDatabase/Sources/Core/FSyncPoint.m b/FirebaseDatabase/Sources/Core/FSyncPoint.m
@@ -27,7 +27,7 @@
 #import "FirebaseDatabase/Sources/Core/View/FView.h"
 #import "FirebaseDatabase/Sources/Core/View/FViewCache.h"
 #import "FirebaseDatabase/Sources/Persistence/FPersistenceManager.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h"
 #import "FirebaseDatabase/Sources/Snapshot/FChildrenNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FEmptyNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FNode.h"
diff --git a/FirebaseDatabase/Sources/Core/View/FChange.h b/FirebaseDatabase/Sources/Core/View/FChange.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Snapshot/FIndexedNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FNode.h"
 #import <Foundation/Foundation.h>
diff --git a/FirebaseDatabase/Sources/Core/View/FDataEvent.h b/FirebaseDatabase/Sources/Core/View/FDataEvent.h
@@ -15,8 +15,8 @@
  */
 
 #import "FirebaseDatabase/Sources/Core/View/FEvent.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataSnapshot.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataSnapshot.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Utilities/Tuples/FTupleUserCallback.h"
 #import <Foundation/Foundation.h>
 
diff --git a/FirebaseDatabase/Sources/Core/View/FEvent.h b/FirebaseDatabase/Sources/Core/View/FEvent.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRDataEventType.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h"
 #import <Foundation/Foundation.h>
 
 @class FPath;
diff --git a/FirebaseDatabase/Sources/Core/View/FEventRegistration.h b/FirebaseDatabase/Sources/Core/View/FEventRegistration.h
@@ -15,7 +15,7 @@
  */
 
 #import "FirebaseDatabase/Sources/Core/View/FChange.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataEventType.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h"
 #import <Foundation/Foundation.h>
 
 @protocol FEvent;
diff --git a/FirebaseDatabase/Sources/Core/View/FView.m b/FirebaseDatabase/Sources/Core/View/FView.m
@@ -30,7 +30,7 @@
 #import "FirebaseDatabase/Sources/FEventGenerator.h"
 #import "FirebaseDatabase/Sources/FViewProcessor.h"
 #import "FirebaseDatabase/Sources/FViewProcessorResult.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h"
 #import "FirebaseDatabase/Sources/Snapshot/FEmptyNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FIndexedNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FNode.h"
diff --git a/FirebaseDatabase/Sources/FIRDatabaseReference.m b/FirebaseDatabase/Sources/FIRDatabaseReference.m
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h"
 #import "FirebaseDatabase/Sources/Core/FQueryParams.h"
 #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabase.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h"
 #import "FirebaseDatabase/Sources/Snapshot/FSnapshotUtilities.h"
 #import "FirebaseDatabase/Sources/Utilities/FNextPushId.h"
 #import "FirebaseDatabase/Sources/Utilities/FStringUtilities.h"
diff --git a/FirebaseDatabase/Sources/FViewProcessor.m b/FirebaseDatabase/Sources/FViewProcessor.m
@@ -31,7 +31,7 @@
 #import "FirebaseDatabase/Sources/Core/View/Filter/FNodeFilter.h"
 #import "FirebaseDatabase/Sources/FKeyIndex.h"
 #import "FirebaseDatabase/Sources/FViewProcessorResult.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataEventType.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h"
 #import "FirebaseDatabase/Sources/Snapshot/FChildrenNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FCompoundWrite.h"
 #import "FirebaseDatabase/Sources/Snapshot/FEmptyNode.h"
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataSnapshot.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataSnapshot.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRMutableData.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRMutableData.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRServerValue.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRServerValue.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRTransactionResult.h
diff --git a/FirebaseDatabase/Sources/Public/FirebaseDatabase/FirebaseDatabase.h b/FirebaseDatabase/Sources/Public/FirebaseDatabase/FirebaseDatabase.h
diff --git a/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m b/FirebaseDatabase/Sources/Realtime/FWebSocketConnection.m
@@ -22,7 +22,7 @@
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabase_Private.h"
 #import "FirebaseDatabase/Sources/Constants/FConstants.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Realtime/FWebSocketConnection.h"
 #import "FirebaseDatabase/Sources/Utilities/FStringUtilities.h"
 
diff --git a/FirebaseDatabase/Sources/Utilities/FEventEmitter.h b/FirebaseDatabase/Sources/Utilities/FEventEmitter.h
@@ -16,7 +16,7 @@
 
 #import "FirebaseDatabase/Sources/Api/FIRDatabaseConfig.h"
 #import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h"
 
 @interface FEventEmitter : NSObject
 
diff --git a/FirebaseDatabase/Sources/Utilities/FValidation.h b/FirebaseDatabase/Sources/Utilities/FValidation.h
@@ -15,7 +15,7 @@
  */
 
 #import "FirebaseDatabase/Sources/Core/Utilities/FPath.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataEventType.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h"
 #import "FirebaseDatabase/Sources/Utilities/FParsedUrl.h"
 #import "FirebaseDatabase/Sources/Utilities/FTypedefs.h"
 #import <Foundation/Foundation.h>
diff --git a/FirebaseDatabase/Sources/Utilities/Tuples/FTupleFirebase.h b/FirebaseDatabase/Sources/Utilities/Tuples/FTupleFirebase.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import <Foundation/Foundation.h>
 
 @interface FTupleFirebase : NSObject
diff --git a/FirebaseDatabase/Tests/Helpers/FDevice.m b/FirebaseDatabase/Tests/Helpers/FDevice.m
@@ -17,7 +17,7 @@
 #import "FirebaseDatabase/Tests/Helpers/FDevice.h"
 #import <XCTest/XCTest.h>
 
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h"
 #import "FirebaseDatabase/Sources/Core/FRepoManager.h"
diff --git a/FirebaseDatabase/Tests/Helpers/FEventTester.m b/FirebaseDatabase/Tests/Helpers/FEventTester.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseDatabase/Tests/Helpers/FEventTester.h"
 
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 
 #import "FirebaseDatabase/Sources/Utilities/Tuples/FTupleBoolBlock.h"
 #import "FirebaseDatabase/Tests/Helpers/FTestHelpers.h"
diff --git a/FirebaseDatabase/Tests/Helpers/FTestExpectations.h b/FirebaseDatabase/Tests/Helpers/FTestExpectations.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseQuery.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseQuery.h"
 
 @interface FTestExpectations : XCTestCase {
   NSMutableArray* expectations;
diff --git a/FirebaseDatabase/Tests/Helpers/FTestExpectations.m b/FirebaseDatabase/Tests/Helpers/FTestExpectations.m
@@ -15,7 +15,7 @@
  */
 
 #import "FirebaseDatabase/Tests/Helpers/FTestExpectations.h"
-#import "FirebaseDatabase/Sources/Public/FIRDataSnapshot.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataSnapshot.h"
 
 @interface FExpectation : NSObject
 
diff --git a/FirebaseDatabase/Tests/Helpers/FTupleEventTypeString.h b/FirebaseDatabase/Tests/Helpers/FTupleEventTypeString.h
@@ -15,8 +15,8 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FirebaseDatabase/Sources/Public/FIRDataEventType.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDataEventType.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Utilities/FTypedefs.h"
 
 @interface FTupleEventTypeString : NSObject
diff --git a/FirebaseDatabase/Tests/Integration/FData.m b/FirebaseDatabase/Tests/Integration/FData.m
@@ -20,7 +20,7 @@
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h"
 #import "FirebaseDatabase/Sources/Core/FRepo_Private.h"
 #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRServerValue.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRServerValue.h"
 #import "FirebaseDatabase/Tests/Helpers/FEventTester.h"
 #import "FirebaseDatabase/Tests/Helpers/FTestHelpers.h"
 #import "FirebaseDatabase/Tests/Helpers/FTupleEventTypeString.h"
diff --git a/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m b/FirebaseDatabase/Tests/Integration/FIRDatabaseTests.m
@@ -20,8 +20,8 @@
 
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h"
 #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabase.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabase.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Tests/Helpers/FIRFakeApp.h"
 #import "FirebaseDatabase/Tests/Helpers/FMockStorageEngine.h"
 #import "FirebaseDatabase/Tests/Helpers/FTestBase.h"
diff --git a/FirebaseDatabase/Tests/Integration/FOrder.m b/FirebaseDatabase/Tests/Integration/FOrder.m
@@ -16,7 +16,7 @@
 
 #import "FirebaseDatabase/Tests/Integration/FOrder.h"
 #import "FirebaseDatabase/Sources/Api/Private/FTypedefs_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Utilities/Tuples/FTupleFirebase.h"
 #import "FirebaseDatabase/Tests/Helpers/FEventTester.h"
 #import "FirebaseDatabase/Tests/Helpers/FTestHelpers.h"
diff --git a/FirebaseDatabase/Tests/Integration/FPersist.m b/FirebaseDatabase/Tests/Integration/FPersist.m
@@ -20,7 +20,7 @@
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h"
 #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseReference_Private.h"
 #import "FirebaseDatabase/Sources/Core/FRepo_Private.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Tests/Helpers/FDevice.h"
 #import "FirebaseDatabase/Tests/Helpers/FTestHelpers.h"
 
diff --git a/FirebaseDatabase/Tests/Unit/FIRDataSnapshotTests.m b/FirebaseDatabase/Tests/Unit/FIRDataSnapshotTests.m
@@ -19,7 +19,7 @@
 #import "FirebaseDatabase/Sources/FIRDatabaseConfig_Private.h"
 #import "FirebaseDatabase/Sources/FPathIndex.h"
 #import "FirebaseDatabase/Sources/FValueIndex.h"
-#import "FirebaseDatabase/Sources/Public/FIRDatabaseReference.h"
+#import "FirebaseDatabase/Sources/Public/FirebaseDatabase/FIRDatabaseReference.h"
 #import "FirebaseDatabase/Sources/Snapshot/FChildrenNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FEmptyNode.h"
 #import "FirebaseDatabase/Sources/Snapshot/FLeafNode.h"

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel`
`32`	`32`	`'Interop/Auth/Public/*.h',`
`33`	`33`	`'FirebaseCore/Sources/Private/*.h',`
`34`	`34`	`]`
`35`		`- s.public_header_files = base_dir + 'Public/*.h'`
	`35`	`+ s.public_header_files = base_dir + 'Public/FirebaseDatabase/*.h'`
`36`	`36`	`s.libraries = ['c++', 'icucore']`
`37`	`37`	`s.frameworks = 'CFNetwork', 'Security', 'SystemConfiguration'`
`38`	`38`	`s.dependency 'leveldb-library', '~> 1.22'`