Fix brokenTests

FirebaseFirestoreInternal/FirebaseFirestore/FIRTimestamp.h

@@ -1,15 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#import <FirebaseFirestoreInternal/FIRTimestamp.h>

Firestore/Example/Firestore.xcodeproj/xcshareddata/xcschemes/Firestore_Benchmarks_iOS.xcscheme

@@ -41,6 +41,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5CAE131820FFFED600BE9A4A"
+            BuildableName = "Firestore_Benchmarks_iOS.xctest"
+            BlueprintName = "Firestore_Benchmarks_iOS"
+            ReferencedContainer = "container:Firestore.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +62,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5CAE131820FFFED600BE9A4A"
-            BuildableName = "Firestore_Benchmarks_iOS.xctest"
-            BlueprintName = "Firestore_Benchmarks_iOS"
-            ReferencedContainer = "container:Firestore.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
             ReferencedContainer = "container:Firestore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Firestore/Example/Tests/API/FSTUserDataReaderTests.mm

@@ -16,9 +16,9 @@
 
 #import "Firestore/Source/API/FSTUserDataReader.h"
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import <FirebaseFirestore/FIRFieldValue.h>
 #import <FirebaseFirestore/FIRGeoPoint.h>
-#import <FirebaseFirestore/FIRTimestamp.h>
 #import <XCTest/XCTest.h>
 
 #import "Firestore/Example/Tests/Util/FSTHelpers.h"

Firestore/Example/Tests/Integration/API/FIRCompositeIndexQueryTests.mm

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import <FirebaseFirestore/FirebaseFirestore.h>
+
 #import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 #include "Firestore/core/src/util/autoid.h"

Firestore/Example/Tests/Integration/API/FIRCursorTests.mm

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>

Firestore/Example/Tests/Integration/API/FIRDatabaseTests.mm

@@ -17,6 +17,7 @@
 // TODO(wuandy): Delete this once isPersistenceEnabled and cacheSizeBytes are removed.
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>

Firestore/Example/Tests/Integration/API/FIRFieldsTests.mm

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import <FirebaseFirestore/FIRTimestamp.h>
+#import <FirebaseCore/FIRTimestamp.h>
 #import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>

Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.mm

@@ -16,6 +16,7 @@
 
 #import <FirebaseFirestore/FirebaseFirestore.h>
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import <XCTest/XCTest.h>
 
 #import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"

Firestore/Example/Tests/Integration/API/FIRTypeTests.mm

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import <FirebaseFirestore/FirebaseFirestore.h>
 
 #import <XCTest/XCTest.h>

Firestore/Example/Tests/Integration/FSTDatastoreTests.mm

@@ -16,7 +16,7 @@
 
 #import <FirebaseFirestore/FirebaseFirestore.h>
 
-#import <FirebaseFirestore/FIRTimestamp.h>
+#import <FirebaseCore/FIRTimestamp.h>
 #import <XCTest/XCTest.h>
 
 #include <memory>

Firestore/Source/API/FIRDocumentSnapshot.mm

@@ -19,6 +19,8 @@
 #include <utility>
 #include <vector>
 
+#import <FirebaseCore/FIRTimestamp.h>
+
 #include "Firestore/core/src/util/warnings.h"
 
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
@@ -26,7 +28,6 @@
 #import "Firestore/Source/API/FIRFirestore+Internal.h"
 #import "Firestore/Source/API/FIRGeoPoint+Internal.h"
 #import "Firestore/Source/API/FIRSnapshotMetadata+Internal.h"
-#import "Firestore/Source/API/FIRTimestamp+Internal.h"
 #import "Firestore/Source/API/FSTUserDataWriter.h"
 #import "Firestore/Source/API/converters.h"
 

Firestore/Source/API/FSTUserDataReader.mm

@@ -22,8 +22,8 @@
 #include <utility>
 #include <vector>
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import "FIRGeoPoint.h"
-#import "FIRTimestamp.h"
 
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
 #import "Firestore/Source/API/FIRFieldPath+Internal.h"

Firestore/Source/API/converters.mm

@@ -18,8 +18,8 @@
 
 #include <utility>
 
+#import <FirebaseCore/FIRTimestamp.h>
 #import "FIRGeoPoint.h"
-#import "FIRTimestamp.h"
 
 #include "Firestore/Source/API/FIRDocumentReference+Internal.h"
 #include "Firestore/core/include/firebase/firestore/geo_point.h"

Firestore/Swift/Source/Codable/TimestampDecodingStrategy.swift

@@ -16,9 +16,9 @@
 
 import Foundation
 #if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternalWrapper
+  @_exported import FirebaseCoreExtension
 #else
-  @_exported import FirebaseFirestoreInternal
+  @_exported import FirebaseCore
 #endif // SWIFT_PACKAGE
 import FirebaseSharedSwift
 

Firestore/Swift/Source/Codable/TimestampEncodingStrategy.swift

@@ -15,9 +15,9 @@
  */
 
 #if SWIFT_PACKAGE
-  @_exported import FirebaseFirestoreInternalWrapper
+  @_exported import FirebaseCoreExtension
 #else
-  @_exported import FirebaseFirestoreInternal
+  @_exported import FirebaseCore
 #endif // SWIFT_PACKAGE
 
 import FirebaseSharedSwift