Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 201fe64

Browse files
authored
Merge pull request #2596 from RocketChat/beta
[RELEASE] Merge BETA into MASTER
2 parents 34bf834 + 066dfba commit 201fe64

File tree

146 files changed

+4636
-870
lines changed

Some content is hidden

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

146 files changed

+4636
-870
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def ui_pods
1414
end
1515

1616
def diff_pods
17-
pod 'DifferenceKit/Core', '~> 0.8'
17+
pod 'DifferenceKit/Core', '~> 1.0'
1818
end
1919

2020
def shared_pods

Podfile.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ PODS:
22
- 1PasswordExtension (1.8.5)
33
- Crashlytics (3.11.1):
44
- Fabric (~> 1.8.1)
5-
- DifferenceKit (0.8.0):
6-
- DifferenceKit/Core (= 0.8.0)
7-
- DifferenceKit/UIKitExtension (= 0.8.0)
8-
- DifferenceKit/Core (0.8.0)
9-
- DifferenceKit/UIKitExtension (0.8.0):
5+
- DifferenceKit (1.0.0):
6+
- DifferenceKit/Core (= 1.0.0)
7+
- DifferenceKit/UIKitExtension (= 1.0.0)
8+
- DifferenceKit/Core (1.0.0)
9+
- DifferenceKit/UIKitExtension (1.0.0):
1010
- DifferenceKit/Core
1111
- Fabric (1.8.2)
1212
- Firebase/Core (5.12.0):
@@ -62,7 +62,7 @@ PODS:
6262
- nanopb/encode (= 0.3.901)
6363
- nanopb/decode (0.3.901)
6464
- nanopb/encode (0.3.901)
65-
- Nuke (7.5.1)
65+
- Nuke (7.5.2)
6666
- Nuke-FLAnimatedImage-Plugin (6.0):
6767
- FLAnimatedImage (~> 1.0)
6868
- Nuke (~> 7.5)
@@ -79,7 +79,7 @@ PODS:
7979
- RocketChatViewController/ViewController (= 1.0.0)
8080
- RocketChatViewController/Composer (1.0.0)
8181
- RocketChatViewController/ViewController (1.0.0):
82-
- DifferenceKit (~> 0.8)
82+
- DifferenceKit (~> 1.0)
8383
- semver (1.1.0)
8484
- SimpleImageViewer (1.2.0):
8585
- FLAnimatedImage
@@ -91,7 +91,7 @@ PODS:
9191
DEPENDENCIES:
9292
- 1PasswordExtension
9393
- Crashlytics
94-
- DifferenceKit/Core (~> 0.8)
94+
- DifferenceKit/Core (~> 1.0)
9595
- Fabric
9696
- Firebase/Core
9797
- FLEX (~> 2.0)
@@ -157,7 +157,7 @@ CHECKOUT OPTIONS:
157157
:commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
158158
:git: https://github.com/RocketChat/RCMarkdownParser.git
159159
RocketChatViewController:
160-
:commit: 7e2f461f9409f00b00f2e0a569378de2982570b0
160+
:commit: ff8b2f080e05e10286f1d84304f0713375c3f952
161161
:git: https://github.com/RocketChat/RocketChatViewController
162162
SimpleImageViewer:
163163
:commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
@@ -166,7 +166,7 @@ CHECKOUT OPTIONS:
166166
SPEC CHECKSUMS:
167167
1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
168168
Crashlytics: ca7ab4bc304aa216bdc2e4c1a96389ee77252203
169-
DifferenceKit: edcc9da33f545a49a70eefcf1a5327162cb72eb8
169+
DifferenceKit: d501e37b866e98a8aaee0f61ceb02ad98e52b9c1
170170
Fabric: d2b22f443ba195d8a7cc204da230977c72733b40
171171
Firebase: 9190018e296139d938b99521cde0c15a6e8d2946
172172
FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba
@@ -179,21 +179,21 @@ SPEC CHECKSUMS:
179179
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
180180
MobilePlayer: 069b13482499f14c25b6ce53f63a91e17975b073
181181
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
182-
Nuke: 3814db501e55f17951451839c726ffd91641e9a5
182+
Nuke: 0350d346a688426e8f2331253ef28dc2fc4f6178
183183
Nuke-FLAnimatedImage-Plugin: e4c39d13061a08ac0bdcb0cd7a23882f4a43f4a6
184184
OAuthSwift: 27b34fe80b76b67cd8f45571e0be2432bc9f6de1
185185
RCMarkdownParser: 518b616a4f48bb02247243544d4fd55c048288a4
186186
ReachabilitySwift: 35720ffea59c1c76d15f885be77fd33e33985427
187187
Realm: cdaef23c4ddb36ab1ddffed23f5a7f3332fc5585
188188
RealmSwift: 5576324033f0aa5ef1e0a839a3da2281dff47a7f
189-
RocketChatViewController: d777bcaf9463fc56b7fc7c9ce14873b9cd6b9cfe
189+
RocketChatViewController: 8c9fa96502913d268bcecf6d15830f1ffd711e7b
190190
semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
191191
SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
192192
Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
193193
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
194194
SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
195195
SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20
196196

197-
PODFILE CHECKSUM: 5de85ce8e162b64ac2f6aa9802ba9d08358506a1
197+
PODFILE CHECKSUM: cbbebee0941a6f5f7f64b4a05944c537b22215a4
198198

199199
COCOAPODS: 1.5.3

Pods/DifferenceKit/README.md

Lines changed: 21 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/DifferenceKit/Sources/AnyDifferentiable.swift

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Local Podspecs/RocketChatViewController.podspec.json

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Manifest.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Nuke/README.md

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Nuke/Sources/ImageView.swift

Lines changed: 14 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)