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

Commit c603adc

Browse files
authored
Merge pull request #2697 from RocketChat/beta
[RELEASE] Merge BETA into MASTER
2 parents df0e867 + ff91589 commit c603adc

File tree

144 files changed

+6317
-3217
lines changed

Some content is hidden

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

144 files changed

+6317
-3217
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def shared_pods
4444
# Network
4545
pod 'Nuke', '~> 7.3'
4646
pod 'Nuke-FLAnimatedImage-Plugin'
47-
pod 'Starscream', '~> 2'
47+
pod 'Starscream', '~> 3'
4848
pod 'ReachabilitySwift'
4949

5050
# Authentication SDKs

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ PODS:
8383
- semver (1.1.0)
8484
- SimpleImageViewer (1.2.0):
8585
- FLAnimatedImage
86-
- Starscream (2.1.1)
86+
- Starscream (3.0.6)
8787
- SwiftLint (0.27.0)
8888
- SwiftyJSON (4.2.0)
8989
- SwipeCellKit (2.5.0)
@@ -106,7 +106,7 @@ DEPENDENCIES:
106106
- RocketChatViewController (from `https://github.com/RocketChat/RocketChatViewController`)
107107
- semver
108108
- SimpleImageViewer (from `https://github.com/cardoso/SimpleImageViewer.git`)
109-
- Starscream (~> 2)
109+
- Starscream (~> 3)
110110
- SwiftLint
111111
- SwiftyJSON
112112
- SwipeCellKit
@@ -189,11 +189,11 @@ SPEC CHECKSUMS:
189189
RocketChatViewController: 8c9fa96502913d268bcecf6d15830f1ffd711e7b
190190
semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
191191
SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
192-
Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
192+
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
193193
SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
194194
SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
195195
SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20
196196

197-
PODFILE CHECKSUM: c5c2f2dc03abb29b2bd3f58d81e244a50136c6d3
197+
PODFILE CHECKSUM: 0a0c1af76ff3117939f4bead787ace1168fc1c99
198198

199199
COCOAPODS: 1.5.3

Pods/Manifest.lock

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

Pods/Pods.xcodeproj/project.pbxproj

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

Pods/Starscream/README.md

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

Pods/Starscream/Source/Compression.swift renamed to Pods/Starscream/Sources/Starscream/Compression.swift

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

0 commit comments

Comments
 (0)