Skip to content

Commit 0c91025

Browse files
aslanyanhaikaslanyanhaik
committed
Merge branch 'develop'
2 parents 7531cdc + 5d74153 commit 0c91025

File tree

420 files changed

+5101
-47042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

420 files changed

+5101
-47042
lines changed

‎.DS_Store

-8 KB
Binary file not shown.

‎.gitignore

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# https://github.com/github/gitignore/blob/master/Swift.gitignore
2+
3+
## Build generated
4+
build/
5+
DerivedData/
6+
7+
## Various settings
8+
*.pbxuser
9+
!default.pbxuser
10+
*.mode1v3
11+
!default.mode1v3
12+
*.mode2v3
13+
!default.mode2v3
14+
*.perspectivev3
15+
!default.perspectivev3
16+
xcuserdata/
17+
18+
## Other
19+
*.moved-aside
20+
*.xcuserstate
21+
*.cer
22+
*.mobileprovision
23+
24+
## Obj-C/Swift specific
25+
*.hmap
26+
*.ipa
27+
*.dSYM.zip
28+
*.dSYM
29+
30+
## Playgrounds
31+
timeline.xctimeline
32+
playground.xcworkspace
33+
34+
# Swift Package Manager
35+
#
36+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
37+
Packages/
38+
.build/
39+
40+
# CocoaPods
41+
#
42+
# We recommend against adding the Pods directory to your .gitignore. However
43+
# you should judge for yourself, the pros and cons are mentioned at:
44+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
45+
#
46+
/Pods/*
47+
# Carthage
48+
#
49+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
50+
# Carthage/Checkouts
51+
52+
Carthage/Build
53+
54+
# fastlane
55+
#
56+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
57+
# screenshots whenever they are needed.
58+
# For more information about the recommended setup visit:
59+
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
60+
61+
fastlane/report.xml
62+
fastlane/Preview.html
63+
fastlane/screenshots
64+
fastlane/test_output
65+
66+
67+
68+
# Others
69+
.DS_Store
70+
.idea/
71+
72+
73+
### Firebase ###
74+
.idea
75+
**/node_modules/*
76+
**/.firebaserc
77+

‎Podfile

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
1+
platform :ios, '12.0'
2+
use_frameworks!
3+
inhibit_all_warnings!
4+
ENV['COCOAPODS_DISABLE_STATS'] = "true"
35

46
target 'QuickChat' do
5-
# Comment this line if you're not using Swift and don't want to use dynamic frameworks
6-
use_frameworks!
7-
8-
# Pods for QuickChat
9-
10-
pod 'Firebase/Database'
11-
pod 'Firebase/Auth'
12-
pod 'Firebase/Storage'
7+
8+
pod 'Firebase/Core'
9+
pod 'Firebase/Auth'
10+
pod 'Firebase/Storage'
11+
pod 'Kingfisher'
12+
pod 'Firebase/Firestore'
13+
pod 'ALLoadingView'
1314

1415
end

‎Podfile.lock

+154-59
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,168 @@
11
PODS:
2-
- Firebase/Auth (4.8.2):
3-
- Firebase/Core
4-
- FirebaseAuth (= 4.4.2)
5-
- Firebase/Core (4.8.2):
6-
- FirebaseAnalytics (= 4.0.9)
7-
- FirebaseCore (= 4.0.14)
8-
- Firebase/Database (4.8.2):
9-
- Firebase/Core
10-
- FirebaseDatabase (= 4.1.4)
11-
- Firebase/Storage (4.8.2):
12-
- Firebase/Core
13-
- FirebaseStorage (= 2.1.2)
14-
- FirebaseAnalytics (4.0.9):
15-
- FirebaseCore (~> 4.0)
16-
- FirebaseInstanceID (~> 2.0)
17-
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
2+
- ALLoadingView (1.1.5)
3+
- BoringSSL-GRPC (0.0.3):
4+
- BoringSSL-GRPC/Implementation (= 0.0.3)
5+
- BoringSSL-GRPC/Interface (= 0.0.3)
6+
- BoringSSL-GRPC/Implementation (0.0.3):
7+
- BoringSSL-GRPC/Interface (= 0.0.3)
8+
- BoringSSL-GRPC/Interface (0.0.3)
9+
- Firebase/Auth (6.0.0):
10+
- Firebase/CoreOnly
11+
- FirebaseAuth (~> 6.0.0)
12+
- Firebase/Core (6.0.0):
13+
- Firebase/CoreOnly
14+
- FirebaseAnalytics (= 6.0.0)
15+
- Firebase/CoreOnly (6.0.0):
16+
- FirebaseCore (= 6.0.0)
17+
- Firebase/Firestore (6.0.0):
18+
- Firebase/CoreOnly
19+
- FirebaseFirestore (~> 1.3.0)
20+
- Firebase/Storage (6.0.0):
21+
- Firebase/CoreOnly
22+
- FirebaseStorage (~> 3.2.0)
23+
- FirebaseAnalytics (6.0.0):
24+
- FirebaseCore (~> 6.0)
25+
- FirebaseInstanceID (~> 4.0)
26+
- GoogleAppMeasurement (= 6.0.0)
27+
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
28+
- GoogleUtilities/MethodSwizzler (~> 6.0)
29+
- GoogleUtilities/Network (~> 6.0)
30+
- "GoogleUtilities/NSData+zlib (~> 6.0)"
1831
- nanopb (~> 0.3)
19-
- FirebaseAuth (4.4.2):
20-
- FirebaseAnalytics (~> 4.0)
21-
- GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)
32+
- FirebaseAuth (6.0.0):
33+
- FirebaseAuthInterop (~> 1.0)
34+
- FirebaseCore (~> 6.0)
35+
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
36+
- GoogleUtilities/Environment (~> 6.0)
2237
- GTMSessionFetcher/Core (~> 1.1)
23-
- FirebaseCore (4.0.14):
24-
- GoogleToolboxForMac/NSData+zlib (~> 2.1)
25-
- FirebaseDatabase (4.1.4):
26-
- FirebaseAnalytics (~> 4.0)
27-
- FirebaseCore (~> 4.0)
28-
- leveldb-library (~> 1.18)
29-
- FirebaseInstanceID (2.0.8):
30-
- FirebaseCore (~> 4.0)
31-
- FirebaseStorage (2.1.2):
32-
- FirebaseAnalytics (~> 4.0)
33-
- FirebaseCore (~> 4.0)
38+
- FirebaseAuthInterop (1.0.0)
39+
- FirebaseCore (6.0.0):
40+
- GoogleUtilities/Environment (~> 6.0)
41+
- GoogleUtilities/Logger (~> 6.0)
42+
- FirebaseFirestore (1.3.0):
43+
- FirebaseAuthInterop (~> 1.0)
44+
- FirebaseCore (~> 6.0)
45+
- FirebaseFirestore/abseil-cpp (= 1.3.0)
46+
- "gRPC-C++ (= 0.0.8)"
47+
- leveldb-library (~> 1.20)
48+
- nanopb (~> 0.3.901)
49+
- Protobuf (~> 3.1)
50+
- FirebaseFirestore/abseil-cpp (1.3.0):
51+
- FirebaseAuthInterop (~> 1.0)
52+
- FirebaseCore (~> 6.0)
53+
- "gRPC-C++ (= 0.0.8)"
54+
- leveldb-library (~> 1.20)
55+
- nanopb (~> 0.3.901)
56+
- Protobuf (~> 3.1)
57+
- FirebaseInstanceID (4.0.0):
58+
- FirebaseCore (~> 6.0)
59+
- GoogleUtilities/Environment (~> 6.0)
60+
- GoogleUtilities/UserDefaults (~> 6.0)
61+
- FirebaseStorage (3.2.0):
62+
- FirebaseAuthInterop (~> 1.0)
63+
- FirebaseCore (~> 6.0)
3464
- GTMSessionFetcher/Core (~> 1.1)
35-
- GoogleToolboxForMac/DebugUtils (2.1.3):
36-
- GoogleToolboxForMac/Defines (= 2.1.3)
37-
- GoogleToolboxForMac/Defines (2.1.3)
38-
- GoogleToolboxForMac/NSData+zlib (2.1.3):
39-
- GoogleToolboxForMac/Defines (= 2.1.3)
40-
- GoogleToolboxForMac/NSDictionary+URLArguments (2.1.3):
41-
- GoogleToolboxForMac/DebugUtils (= 2.1.3)
42-
- GoogleToolboxForMac/Defines (= 2.1.3)
43-
- GoogleToolboxForMac/NSString+URLArguments (= 2.1.3)
44-
- GoogleToolboxForMac/NSString+URLArguments (2.1.3)
45-
- GTMSessionFetcher/Core (1.1.13)
65+
- GoogleAppMeasurement (6.0.0):
66+
- GoogleUtilities/AppDelegateSwizzler (~> 6.0)
67+
- GoogleUtilities/MethodSwizzler (~> 6.0)
68+
- GoogleUtilities/Network (~> 6.0)
69+
- "GoogleUtilities/NSData+zlib (~> 6.0)"
70+
- nanopb (~> 0.3)
71+
- GoogleUtilities/AppDelegateSwizzler (6.0.0):
72+
- GoogleUtilities/Environment
73+
- GoogleUtilities/Logger
74+
- GoogleUtilities/Network
75+
- GoogleUtilities/Environment (6.0.0)
76+
- GoogleUtilities/Logger (6.0.0):
77+
- GoogleUtilities/Environment
78+
- GoogleUtilities/MethodSwizzler (6.0.0):
79+
- GoogleUtilities/Logger
80+
- GoogleUtilities/Network (6.0.0):
81+
- GoogleUtilities/Logger
82+
- "GoogleUtilities/NSData+zlib"
83+
- GoogleUtilities/Reachability
84+
- "GoogleUtilities/NSData+zlib (6.0.0)"
85+
- GoogleUtilities/Reachability (6.0.0):
86+
- GoogleUtilities/Logger
87+
- GoogleUtilities/UserDefaults (6.0.0):
88+
- GoogleUtilities/Logger
89+
- "gRPC-C++ (0.0.8)":
90+
- "gRPC-C++/Implementation (= 0.0.8)"
91+
- "gRPC-C++/Interface (= 0.0.8)"
92+
- "gRPC-C++/Implementation (0.0.8)":
93+
- "gRPC-C++/Interface (= 0.0.8)"
94+
- gRPC-Core (= 1.19.0)
95+
- nanopb (~> 0.3)
96+
- "gRPC-C++/Interface (0.0.8)"
97+
- gRPC-Core (1.19.0):
98+
- gRPC-Core/Implementation (= 1.19.0)
99+
- gRPC-Core/Interface (= 1.19.0)
100+
- gRPC-Core/Implementation (1.19.0):
101+
- BoringSSL-GRPC (= 0.0.3)
102+
- gRPC-Core/Interface (= 1.19.0)
103+
- nanopb (~> 0.3)
104+
- gRPC-Core/Interface (1.19.0)
105+
- GTMSessionFetcher/Core (1.2.1)
106+
- Kingfisher (5.4.0)
46107
- leveldb-library (1.20)
47-
- nanopb (0.3.8):
48-
- nanopb/decode (= 0.3.8)
49-
- nanopb/encode (= 0.3.8)
50-
- nanopb/decode (0.3.8)
51-
- nanopb/encode (0.3.8)
108+
- nanopb (0.3.901):
109+
- nanopb/decode (= 0.3.901)
110+
- nanopb/encode (= 0.3.901)
111+
- nanopb/decode (0.3.901)
112+
- nanopb/encode (0.3.901)
113+
- Protobuf (3.7.0)
52114

53115
DEPENDENCIES:
116+
- ALLoadingView
54117
- Firebase/Auth
55-
- Firebase/Database
118+
- Firebase/Core
119+
- Firebase/Firestore
56120
- Firebase/Storage
121+
- Kingfisher
122+
123+
SPEC REPOS:
124+
https://github.com/cocoapods/specs.git:
125+
- ALLoadingView
126+
- BoringSSL-GRPC
127+
- Firebase
128+
- FirebaseAnalytics
129+
- FirebaseAuth
130+
- FirebaseAuthInterop
131+
- FirebaseCore
132+
- FirebaseFirestore
133+
- FirebaseInstanceID
134+
- FirebaseStorage
135+
- GoogleAppMeasurement
136+
- GoogleUtilities
137+
- "gRPC-C++"
138+
- gRPC-Core
139+
- GTMSessionFetcher
140+
- Kingfisher
141+
- leveldb-library
142+
- nanopb
143+
- Protobuf
57144

58145
SPEC CHECKSUMS:
59-
Firebase: 7d3b8cd837ad9fcd391657734c0d56dab8e9a5a3
60-
FirebaseAnalytics: 388b630c15713f5dbf364071f5f3d6077fb52f4e
61-
FirebaseAuth: bd2738c5c1e92b108ba5f7f7335908097a4e50bb
62-
FirebaseCore: 2e0b98fb2d64ca8140136beff15772bdd14d2dd7
63-
FirebaseDatabase: de4446507ccd3257fca37d16f40e1540324571fd
64-
FirebaseInstanceID: 81df5805a08001e69138664bdd02c6719a9ac80f
65-
FirebaseStorage: 181bb543d39ee3c53e0558de7ba86b1286a0427f
66-
GoogleToolboxForMac: 2501e2ad72a52eb3dfe7bd9aee7dad11b858bd20
67-
GTMSessionFetcher: 5bb1eae636127de695590f50e7d248483eb891e6
146+
ALLoadingView: 5f3a5e73402d3ec178dae51ebdb39c1d64c0a87b
147+
BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318
148+
Firebase: fa80b9d987ca014a1ba9357496ef2a0178b28b12
149+
FirebaseAnalytics: 1743c5f4de3687d0745709dfdc4b1dea1484f44c
150+
FirebaseAuth: efc72b0f6fe075d2a6de8d81a6d9de83ef2b47eb
151+
FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
152+
FirebaseCore: e38f025287b413255a53acc1945d048a112047f7
153+
FirebaseFirestore: 0537b2a960a4819fae2834e688e5daeb571c81d6
154+
FirebaseInstanceID: 0e0348a3c00a734fa376a070f5ad4533ad975cb5
155+
FirebaseStorage: ff1e8f1f6cf1557a8694b0ef39d3e72cb60c42ac
156+
GoogleAppMeasurement: 7f028ea162b72c8f326daec74afc95d94f7a47d6
157+
GoogleUtilities: f1faafc033ea203adf1783ce00af455bb99d0e5b
158+
"gRPC-C++": 98be881723177d8c4faf5fdffacb582c7b4971a2
159+
gRPC-Core: bd9472c8daa2e414b9f8038ba667bf56ce0e02b8
160+
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
161+
Kingfisher: 9c8f2cc6710334e06f32ba2b45e77707d5e2f0c9
68162
leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
69-
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
163+
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
164+
Protobuf: 7a877b7f3e5964e3fce995e2eb323dbc6831bb5a
70165

71-
PODFILE CHECKSUM: 3fd0a4ffcc187cefc2bbb8b876ded067b31dd987
166+
PODFILE CHECKSUM: 151ae1bed8a0c460041494ef1128ea57316c4f72
72167

73-
COCOAPODS: 1.4.0
168+
COCOAPODS: 1.6.1

‎Pods/.DS_Store

-10 KB
Binary file not shown.

0 commit comments

Comments
 (0)