Merge pull request #2697 from RocketChat/beta

[RELEASE] Merge BETA into MASTER
RocketChat · May 10, 2019 · c603adc · c603adc
2 parents df0e867 + ff91589
commit c603adc
Show file tree

Hide file tree

Showing 144 changed files with 6,317 additions and 3,217 deletions.
diff --git a/Podfile b/Podfile
@@ -44,7 +44,7 @@ def shared_pods
   # Network
   pod 'Nuke', '~> 7.3'
   pod 'Nuke-FLAnimatedImage-Plugin'
-  pod 'Starscream', '~> 2'
+  pod 'Starscream', '~> 3'
   pod 'ReachabilitySwift'
 
   # Authentication SDKs

diff --git a/Podfile.lock b/Podfile.lock
@@ -83,7 +83,7 @@ PODS:
   - semver (1.1.0)
   - SimpleImageViewer (1.2.0):
     - FLAnimatedImage
-  - Starscream (2.1.1)
+  - Starscream (3.0.6)
   - SwiftLint (0.27.0)
   - SwiftyJSON (4.2.0)
   - SwipeCellKit (2.5.0)
@@ -106,7 +106,7 @@ DEPENDENCIES:
   - RocketChatViewController (from `https://github.com/RocketChat/RocketChatViewController`)
   - semver
   - SimpleImageViewer (from `https://github.com/cardoso/SimpleImageViewer.git`)
-  - Starscream (~> 2)
+  - Starscream (~> 3)
   - SwiftLint
   - SwiftyJSON
   - SwipeCellKit
@@ -189,11 +189,11 @@ SPEC CHECKSUMS:
   RocketChatViewController: 8c9fa96502913d268bcecf6d15830f1ffd711e7b
   semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
   SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
-  Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
+  Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
   SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
   SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
   SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20
 
-PODFILE CHECKSUM: c5c2f2dc03abb29b2bd3f58d81e244a50136c6d3
+PODFILE CHECKSUM: 0a0c1af76ff3117939f4bead787ace1168fc1c99
 
 COCOAPODS: 1.5.3
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Starscream/README.md b/Pods/Starscream/README.md
diff --git a/Pods/Starscream/Source/Compression.swift → ...ream/Sources/Starscream/Compression.swift b/Pods/Starscream/Source/Compression.swift → ...ream/Sources/Starscream/Compression.swift