Move core/types.h to model to prevent a core -> local -> core dependency cycle (#929)

3 files changed, 8 insertions, 38 deletions

diff --git a/Firestore/core/src/firebase/firestore/core/target_id_generator.cc b/Firestore/core/src/firebase/firestore/core/target_id_generator.cc
index 6d23d64..473d083 100644
--- a/Firestore/core/src/firebase/firestore/core/target_id_generator.cc
+++ b/Firestore/core/src/firebase/firestore/core/target_id_generator.cc
@@ -16,6 +16,8 @@
 
 #include "Firestore/core/src/firebase/firestore/core/target_id_generator.h"
 
+using firebase::firestore::model::TargetId;
+
 namespace firebase {
 namespace firestore {
 namespace core {
diff --git a/Firestore/core/src/firebase/firestore/core/target_id_generator.h b/Firestore/core/src/firebase/firestore/core/target_id_generator.h
index 7d30cf9..870e731 100644
--- a/Firestore/core/src/firebase/firestore/core/target_id_generator.h
+++ b/Firestore/core/src/firebase/firestore/core/target_id_generator.h
@@ -17,7 +17,7 @@
 #ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TARGET_ID_GENERATOR_H_
 #define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TARGET_ID_GENERATOR_H_
 
-#include "Firestore/core/src/firebase/firestore/core/types.h"
+#include "Firestore/core/src/firebase/firestore/model/types.h"
 
 namespace firebase {
 namespace firestore {
@@ -48,7 +48,7 @@ class TargetIdGenerator {
    * @param after An ID to start at. Every call to NextId returns a larger id.
    * @return An instance of TargetIdGenerator.
    */
-  static TargetIdGenerator LocalStoreTargetIdGenerator(TargetId after) {
+  static TargetIdGenerator LocalStoreTargetIdGenerator(model::TargetId after) {
     return TargetIdGenerator(TargetIdGeneratorId::LocalStore, after);
   }
 
@@ -58,7 +58,7 @@ class TargetIdGenerator {
    * @param after An ID to start at. Every call to NextId returns a larger id.
    * @return An instance of TargetIdGenerator.
    */
-  static TargetIdGenerator SyncEngineTargetIdGenerator(TargetId after) {
+  static TargetIdGenerator SyncEngineTargetIdGenerator(model::TargetId after) {
     return TargetIdGenerator(TargetIdGeneratorId::SyncEngine, after);
   }
 
@@ -66,12 +66,12 @@ class TargetIdGenerator {
     return generator_id_;
   }
 
-  TargetId NextId();
+  model::TargetId NextId();
 
  private:
-  TargetIdGenerator(TargetIdGeneratorId generator_id, TargetId after);
+  TargetIdGenerator(TargetIdGeneratorId generator_id, model::TargetId after);
   TargetIdGeneratorId generator_id_;
-  TargetId previous_id_;
+  model::TargetId previous_id_;
 
   static const int kReservedBits = 1;
 };
diff --git a/Firestore/core/src/firebase/firestore/core/types.h b/Firestore/core/src/firebase/firestore/core/types.h
deleted file mode 100644
index 65c2b8c..0000000
--- a/Firestore/core/src/firebase/firestore/core/types.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2018 Google
- *
- * 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.
- */
-
-#ifndef FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TYPES_H_
-#define FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TYPES_H_
-
-#include <stdint.h>
-
-namespace firebase {
-namespace firestore {
-namespace core {
-
-typedef int32_t TargetId;
-
-}  // namespace core
-}  // namespace firestore
-}  // namespace firebase
-
-#endif  // FIRESTORE_CORE_SRC_FIREBASE_FIRESTORE_CORE_TYPES_H_