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

Commit

Permalink
Merge pull request #2596 from RocketChat/beta
Browse files Browse the repository at this point in the history
[RELEASE] Merge BETA into MASTER
  • Loading branch information
rafaelks authored Apr 2, 2019
2 parents 34bf834 + 066dfba commit 201fe64
Show file tree
Hide file tree
Showing 146 changed files with 4,636 additions and 870 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def ui_pods
end

def diff_pods
pod 'DifferenceKit/Core', '~> 0.8'
pod 'DifferenceKit/Core', '~> 1.0'
end

def shared_pods
Expand Down
26 changes: 13 additions & 13 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ PODS:
- 1PasswordExtension (1.8.5)
- Crashlytics (3.11.1):
- Fabric (~> 1.8.1)
- DifferenceKit (0.8.0):
- DifferenceKit/Core (= 0.8.0)
- DifferenceKit/UIKitExtension (= 0.8.0)
- DifferenceKit/Core (0.8.0)
- DifferenceKit/UIKitExtension (0.8.0):
- DifferenceKit (1.0.0):
- DifferenceKit/Core (= 1.0.0)
- DifferenceKit/UIKitExtension (= 1.0.0)
- DifferenceKit/Core (1.0.0)
- DifferenceKit/UIKitExtension (1.0.0):
- DifferenceKit/Core
- Fabric (1.8.2)
- Firebase/Core (5.12.0):
Expand Down Expand Up @@ -62,7 +62,7 @@ PODS:
- nanopb/encode (= 0.3.901)
- nanopb/decode (0.3.901)
- nanopb/encode (0.3.901)
- Nuke (7.5.1)
- Nuke (7.5.2)
- Nuke-FLAnimatedImage-Plugin (6.0):
- FLAnimatedImage (~> 1.0)
- Nuke (~> 7.5)
Expand All @@ -79,7 +79,7 @@ PODS:
- RocketChatViewController/ViewController (= 1.0.0)
- RocketChatViewController/Composer (1.0.0)
- RocketChatViewController/ViewController (1.0.0):
- DifferenceKit (~> 0.8)
- DifferenceKit (~> 1.0)
- semver (1.1.0)
- SimpleImageViewer (1.2.0):
- FLAnimatedImage
Expand All @@ -91,7 +91,7 @@ PODS:
DEPENDENCIES:
- 1PasswordExtension
- Crashlytics
- DifferenceKit/Core (~> 0.8)
- DifferenceKit/Core (~> 1.0)
- Fabric
- Firebase/Core
- FLEX (~> 2.0)
Expand Down Expand Up @@ -157,7 +157,7 @@ CHECKOUT OPTIONS:
:commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
:git: https://github.com/RocketChat/RCMarkdownParser.git
RocketChatViewController:
:commit: 7e2f461f9409f00b00f2e0a569378de2982570b0
:commit: ff8b2f080e05e10286f1d84304f0713375c3f952
:git: https://github.com/RocketChat/RocketChatViewController
SimpleImageViewer:
:commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
Expand All @@ -166,7 +166,7 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
Crashlytics: ca7ab4bc304aa216bdc2e4c1a96389ee77252203
DifferenceKit: edcc9da33f545a49a70eefcf1a5327162cb72eb8
DifferenceKit: d501e37b866e98a8aaee0f61ceb02ad98e52b9c1
Fabric: d2b22f443ba195d8a7cc204da230977c72733b40
Firebase: 9190018e296139d938b99521cde0c15a6e8d2946
FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba
Expand All @@ -179,21 +179,21 @@ SPEC CHECKSUMS:
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
MobilePlayer: 069b13482499f14c25b6ce53f63a91e17975b073
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
Nuke: 3814db501e55f17951451839c726ffd91641e9a5
Nuke: 0350d346a688426e8f2331253ef28dc2fc4f6178
Nuke-FLAnimatedImage-Plugin: e4c39d13061a08ac0bdcb0cd7a23882f4a43f4a6
OAuthSwift: 27b34fe80b76b67cd8f45571e0be2432bc9f6de1
RCMarkdownParser: 518b616a4f48bb02247243544d4fd55c048288a4
ReachabilitySwift: 35720ffea59c1c76d15f885be77fd33e33985427
Realm: cdaef23c4ddb36ab1ddffed23f5a7f3332fc5585
RealmSwift: 5576324033f0aa5ef1e0a839a3da2281dff47a7f
RocketChatViewController: d777bcaf9463fc56b7fc7c9ce14873b9cd6b9cfe
RocketChatViewController: 8c9fa96502913d268bcecf6d15830f1ffd711e7b
semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20

PODFILE CHECKSUM: 5de85ce8e162b64ac2f6aa9802ba9d08358506a1
PODFILE CHECKSUM: cbbebee0941a6f5f7f64b4a05944c537b22215a4

COCOAPODS: 1.5.3
22 changes: 21 additions & 1 deletion Pods/DifferenceKit/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions Pods/DifferenceKit/Sources/AnyDifferentiable.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Pods/Local Podspecs/RocketChatViewController.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Pods/Nuke/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 14 additions & 8 deletions Pods/Nuke/Sources/ImageView.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 201fe64

Please sign in to comment.