Skip to content

Commit 0a238b2

Browse files
1amageek1amageek
committed
fix
1 parent ff7b4d8 commit 0a238b2

19 files changed

+35
-36
lines changed

‎Podfile.lock

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ PODS:
55
- BoringSSL-GRPC/Implementation (0.0.2):
66
- BoringSSL-GRPC/Interface (= 0.0.2)
77
- BoringSSL-GRPC/Interface (0.0.2)
8-
- Firebase (5.19.0):
9-
- Firebase/Core (= 5.19.0)
10-
- Firebase/Core (5.19.0):
8+
- Firebase (5.20.1):
9+
- Firebase/Core (= 5.20.1)
10+
- Firebase/Core (5.20.1):
1111
- Firebase/CoreOnly
1212
- FirebaseAnalytics (= 5.8.0)
13-
- Firebase/CoreOnly (5.19.0):
14-
- FirebaseCore (= 5.4.0)
15-
- Firebase/Firestore (5.19.0):
13+
- Firebase/CoreOnly (5.20.1):
14+
- FirebaseCore (= 5.4.1)
15+
- Firebase/Firestore (5.20.1):
1616
- Firebase/CoreOnly
17-
- FirebaseFirestore (= 1.1.0)
18-
- Firebase/Storage (5.19.0):
17+
- FirebaseFirestore (= 1.2.1)
18+
- Firebase/Storage (5.20.1):
1919
- Firebase/CoreOnly
2020
- FirebaseStorage (= 3.1.1)
2121
- FirebaseAnalytics (5.8.0):
@@ -28,25 +28,25 @@ PODS:
2828
- "GoogleUtilities/NSData+zlib (~> 5.2)"
2929
- nanopb (~> 0.3)
3030
- FirebaseAuthInterop (1.0.0)
31-
- FirebaseCore (5.4.0):
31+
- FirebaseCore (5.4.1):
3232
- GoogleUtilities/Environment (~> 5.2)
3333
- GoogleUtilities/Logger (~> 5.2)
34-
- FirebaseFirestore (1.1.0):
34+
- FirebaseFirestore (1.2.1):
3535
- FirebaseAuthInterop (~> 1.0)
3636
- FirebaseCore (~> 5.2)
37-
- FirebaseFirestore/abseil-cpp (= 1.1.0)
37+
- FirebaseFirestore/abseil-cpp (= 1.2.1)
3838
- "gRPC-C++ (= 0.0.6)"
3939
- leveldb-library (~> 1.20)
4040
- nanopb (~> 0.3.901)
4141
- Protobuf (~> 3.1)
42-
- FirebaseFirestore/abseil-cpp (1.1.0):
42+
- FirebaseFirestore/abseil-cpp (1.2.1):
4343
- FirebaseAuthInterop (~> 1.0)
4444
- FirebaseCore (~> 5.2)
4545
- "gRPC-C++ (= 0.0.6)"
4646
- leveldb-library (~> 1.20)
4747
- nanopb (~> 0.3.901)
4848
- Protobuf (~> 3.1)
49-
- FirebaseInstanceID (3.8.0):
49+
- FirebaseInstanceID (3.8.1):
5050
- FirebaseCore (~> 5.2)
5151
- GoogleUtilities/Environment (~> 5.2)
5252
- GoogleUtilities/UserDefaults (~> 5.2)
@@ -129,12 +129,12 @@ SPEC REPOS:
129129

130130
SPEC CHECKSUMS:
131131
BoringSSL-GRPC: 2a230d9cd93e7ce39916044f645cebb31f37dde6
132-
Firebase: c60d49e9c2630875a96207d15e2affb8364996d1
132+
Firebase: 2f5235e62f141cb86181c3af0dfe4509706351ac
133133
FirebaseAnalytics: fd72a26bf8dac84cefba2f0864366f718555a5b0
134134
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
135-
FirebaseCore: 22a79a961c3951ef2f77b67bfbc99e454247b319
136-
FirebaseFirestore: 1531eefe02da66be6860966ac4e2cdac635706e2
137-
FirebaseInstanceID: cf488df2f4b79782f0e430b04a0e17c0aa7979b2
135+
FirebaseCore: f1a9a8be1aee4bf71a2fc0f4096df6788bdfda61
136+
FirebaseFirestore: faca891c0f0d1d6c10c793473e2f6a29d75014b5
137+
FirebaseInstanceID: a122b0c258720cf250551bb2bedf48c699f80d90
138138
FirebaseStorage: 6162ef4322502b818d9de0ec552f5226d283de43
139139
GoogleAppMeasurement: 1624046ab1bcc5e170061a56ef5679000b079c8e
140140
GoogleUtilities: 6481e6318c5fcabaaa8513ef8120f329055d7c10

‎Pring.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@
274274
12AF82F61F8CAEDE00561159 /* Pring */ = {
275275
isa = PBXGroup;
276276
children = (
277-
8EBFD61821EA536900EC64B2 /* OptionalProtocol.swift */,
278277
12AF82F71F8CAEDE00561159 /* Pring.h */,
278+
8EBFD61821EA536900EC64B2 /* OptionalProtocol.swift */,
279279
12AF830E1F8CAEEC00561159 /* DataSource.swift */,
280280
12C41E771FB31F41002B1526 /* Query.swift */,
281281
12AF83101F8CAEEC00561159 /* DataType.swift */,

‎Pring/Object.swift

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,16 @@ open class Object: NSObject, Document, HasParent {
111111
// MARK: - Initialize
112112

113113
private func _init() {
114-
allChildrenUpToRootObject.forEach { (child) in
114+
for (index, child) in allChildrenUpToRootObject.enumerated() {
115+
let key: String = child.label!
116+
if (key == "_updatedAt" ||
117+
key == "_createdAt" ||
118+
key == "_hash"
119+
) {
120+
continue
121+
}
115122
DataType.verify(value: child.value)
116-
switch DataType(key: child.label!, value: child.value) {
123+
switch DataType(key: key, value: child.value) {
117124
case .file (let key, _, let file): file.setParent(self, forKey: key)
118125
case .collection (let key, _, let collection): collection.setParent(self, forKey: key)
119126
case .list (let key, _, let list): list.setParent(self, forKey: key)

‎Sample/Collecor.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import Foundation
1010
import Firebase
1111
import FirebaseFirestore
12-
import Pring
1312

1413
@objcMembers
1514
class Collector: Object {

‎Sample/DataSourceViewCell.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//
88

99
import UIKit
10-
import Pring
1110

1211
class DataSourceViewCell: UITableViewCell {
1312

‎Sample/DataSourceViewController.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import UIKit
1010
import FirebaseStorage
11-
import Pring
1211

1312
class DataSourceViewController: UITableViewController {
1413

‎Sample/FileControlViewController.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import UIKit
1010
import FirebaseFirestore
11-
import Pring
1211

1312
@objcMembers
1413
class FileControlObject: Object {

‎Sample/Group.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2017年 Stamp Inc. All rights reserved.
77
//
88

9-
import Pring
9+
import Foundation
1010

1111
@objcMembers
1212
class Group: Object {

‎Sample/Item.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import UIKit
10-
import Pring
10+
import Foundation
1111

1212
@objcMembers
1313
class Item: Object {

‎Sample/Media.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2017年 Stamp Inc. All rights reserved.
77
//
88

9-
import Pring
9+
import Foundation
1010

1111
@objcMembers
1212
class Media: Object {

0 commit comments

Comments
 (0)