Merge pull request #3726 from vector-im/element_3570

Update Pods

CHANGES.rst

@@ -6,6 +6,12 @@ Changes to be released in next version
 
 🙌 Improvements
  * Secure backup: Add possibility to not expose recovery key when creating a secure backup.
+ * Update GBDeviceInfo to 6.4.0 (#3570).
+ * Update FlowCommoniOS to 1.9.0 (#3570).
+ * Update KeychainAccess to 4.2.1 (#3570).
+ * Update MatomoTracker to 7.2.2 (#3570).
+ * Update SwiftGen to 6.3.0 (#3570).
+ * Update SwiftLint to 0.40.3 (#3570).
 
 🐛 Bugfix
  * 

Podfile

@@ -51,12 +51,12 @@ end
 
 abstract_target 'RiotPods' do
 
-  pod 'GBDeviceInfo', '~> 6.3.0'
+  pod 'GBDeviceInfo', '~> 6.4.0'
   pod 'Reusable', '~> 4.1'
-  pod 'KeychainAccess', '~> 4.2'
+  pod 'KeychainAccess', '~> 4.2.1'
  
   # Piwik for analytics
-  pod 'MatomoTracker', '~> 7.2.0'
+  pod 'MatomoTracker', '~> 7.2.2'
 
   # Remove warnings from "bad" pods
   pod 'OLMKit', :inhibit_warnings => true
@@ -65,15 +65,15 @@ abstract_target 'RiotPods' do
   pod 'HPGrowingTextView', :inhibit_warnings => true
 
   # Tools
-  pod 'SwiftGen', '~> 6.1'
-  pod 'SwiftLint', '~> 0.36.0'
+  pod 'SwiftGen', '~> 6.3'
+  pod 'SwiftLint', '~> 0.40.3'
 
   target "Riot" do
     import_MatrixKit
     pod 'DGCollectionViewLeftAlignFlowLayout', '~> 1.0.4'
     pod 'KTCenterFlowLayout', '~> 1.3.1'
     pod 'ZXingObjC', '~> 3.6.5'
-    pod 'FlowCommoniOS', '~> 1.8.7'
+    pod 'FlowCommoniOS', '~> 1.9.0'
     pod 'ReadMoreTextView', '~> 3.0.1'
 
     target 'RiotTests' do

Riot/Generated/Images.swift

@@ -143,7 +143,8 @@ internal struct ImageAsset {
     #if os(iOS) || os(tvOS)
     let image = Image(named: name, in: bundle, compatibleWith: nil)
     #elseif os(macOS)
-    let image = bundle.image(forResource: NSImage.Name(name))
+    let name = NSImage.Name(self.name)
+    let image = (bundle == .main) ? NSImage(named: name) : bundle.image(forResource: name)
     #elseif os(watchOS)
     let image = Image(named: name)
     #endif

Riot/Generated/InfoPlist.swift

@@ -52,8 +52,7 @@ internal enum InfoPlist {
 // MARK: - Implementation Details
 
 private func arrayFromPlist<T>(at path: String) -> [T] {
-  let bundle = BundleToken.bundle
-  guard let url = bundle.url(forResource: path, withExtension: nil),
+  guard let url = BundleToken.bundle.url(forResource: path, withExtension: nil),
     let data = NSArray(contentsOf: url) as? [T] else {
     fatalError("Unable to load PLIST at path: \(path)")
   }
@@ -64,8 +63,7 @@ private struct PlistDocument {
   let data: [String: Any]
 
   init(path: String) {
-    let bundle = BundleToken.bundle
-    guard let url = bundle.url(forResource: path, withExtension: nil),
+    guard let url = BundleToken.bundle.url(forResource: path, withExtension: nil),
       let data = NSDictionary(contentsOf: url) as? [String: Any] else {
         fatalError("Unable to load PLIST at path: \(path)")
     }