Merge pull request #2539 from RocketChat/beta

[RELEASE] Merge BETA into MASTER

Author: rafaelks

Podfile

@@ -14,7 +14,7 @@ def ui_pods
 end
 
 def diff_pods
-  pod 'DifferenceKit/Core'
+  pod 'DifferenceKit/Core', '~> 0.8'
 end
 
 def shared_pods
@@ -77,20 +77,26 @@ end
 post_install do |installer|
   swift3Targets = ['MobilePlayer', 'RCMarkdownParser']
   swift42Targets = ['SwipeCellKit']
+
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['SWIFT_VERSION'] = '4.1'
+      config.build_settings['ENABLE_BITCODE'] = 'NO'
+      config.build_settings['ARCHS'] = 'arm64'
+
       if config.name == 'Debug'
         config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Onone'
       else
         config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Owholemodule'
       end
     end
+
     if swift3Targets.include? target.name
       target.build_configurations.each do |config|
         config.build_settings['SWIFT_VERSION'] = '3.1'
       end
     end
+
     if swift42Targets.include? target.name
       target.build_configurations.each do |config|
         config.build_settings['SWIFT_VERSION'] = '4.2'

Podfile.lock

@@ -2,11 +2,11 @@ PODS:
   - 1PasswordExtension (1.8.5)
   - Crashlytics (3.11.1):
     - Fabric (~> 1.8.1)
-  - DifferenceKit (0.7.2):
-    - DifferenceKit/Core (= 0.7.2)
-    - DifferenceKit/UIKitExtension (= 0.7.2)
-  - DifferenceKit/Core (0.7.2)
-  - DifferenceKit/UIKitExtension (0.7.2):
+  - 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/Core
   - Fabric (1.8.2)
   - Firebase/Core (5.12.0):
@@ -74,12 +74,12 @@ PODS:
   - Realm/Headers (3.12.0)
   - RealmSwift (3.12.0):
     - Realm (= 3.12.0)
-  - RocketChatViewController (0.1.0):
-    - RocketChatViewController/Composer (= 0.1.0)
-    - RocketChatViewController/ViewController (= 0.1.0)
-  - RocketChatViewController/Composer (0.1.0)
-  - RocketChatViewController/ViewController (0.1.0):
-    - DifferenceKit (~> 0.7.2)
+  - RocketChatViewController (1.0.0):
+    - RocketChatViewController/Composer (= 1.0.0)
+    - RocketChatViewController/ViewController (= 1.0.0)
+  - RocketChatViewController/Composer (1.0.0)
+  - RocketChatViewController/ViewController (1.0.0):
+    - DifferenceKit (~> 0.8)
   - semver (1.1.0)
   - SimpleImageViewer (1.2.0):
     - FLAnimatedImage
@@ -91,7 +91,7 @@ PODS:
 DEPENDENCIES:
   - 1PasswordExtension
   - Crashlytics
-  - DifferenceKit/Core
+  - DifferenceKit/Core (~> 0.8)
   - Fabric
   - Firebase/Core
   - FLEX (~> 2.0)
@@ -157,7 +157,7 @@ CHECKOUT OPTIONS:
     :commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
     :git: https://github.com/RocketChat/RCMarkdownParser.git
   RocketChatViewController:
-    :commit: 918d9d91fb856b836795e673b112dc2624f2be06
+    :commit: 7e2f461f9409f00b00f2e0a569378de2982570b0
     :git: https://github.com/RocketChat/RocketChatViewController
   SimpleImageViewer:
     :commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
@@ -166,7 +166,7 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
   Crashlytics: ca7ab4bc304aa216bdc2e4c1a96389ee77252203
-  DifferenceKit: 5179eaf0e76a1b9fbaeb93f4c1a82510be63ca65
+  DifferenceKit: edcc9da33f545a49a70eefcf1a5327162cb72eb8
   Fabric: d2b22f443ba195d8a7cc204da230977c72733b40
   Firebase: 9190018e296139d938b99521cde0c15a6e8d2946
   FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba
@@ -186,14 +186,14 @@ SPEC CHECKSUMS:
   ReachabilitySwift: 35720ffea59c1c76d15f885be77fd33e33985427
   Realm: cdaef23c4ddb36ab1ddffed23f5a7f3332fc5585
   RealmSwift: 5576324033f0aa5ef1e0a839a3da2281dff47a7f
-  RocketChatViewController: 00d436e393ac0bd0a62bc72d9a35a9043fc3f3a5
+  RocketChatViewController: d777bcaf9463fc56b7fc7c9ce14873b9cd6b9cfe
   semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
   SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
   Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
   SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
   SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
   SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20
 
-PODFILE CHECKSUM: 5d62982fe6d8cd234f28edafc23b27595439d854
+PODFILE CHECKSUM: 5de85ce8e162b64ac2f6aa9802ba9d08358506a1
 
 COCOAPODS: 1.5.3