Merge branch 'release/0.16.6/master'

matrix-org · Oct 12, 2021 · fe6415a · fe6415a
2 parents 214253c + 525f7f7
commit fe6415a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 13 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,14 @@
+## Changes in 0.16.6 (2021-10-12)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.6)).
+
+🐛 Bugfixes
+
+- MXKEventFormatter: Fixed invalid parameters passed to generated localization functions. ([#4899](https://github.com/vector-im/element-ios/issues/4899))
+
+
 ## Changes in 0.16.5 (2021-10-08)
 
 🙌 Improvements

diff --git a/MatrixKit.podspec b/MatrixKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.16.5"
+  s.version      = "0.16.6"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.20.5"
+  s.dependency 'MatrixSDK', "= 0.20.6"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.25'

diff --git a/MatrixKit/MatrixKitVersion.m b/MatrixKit/MatrixKitVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixKitVersion = @"0.16.5";
+NSString *const MatrixKitVersion = @"0.16.6";
diff --git a/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -997,11 +997,11 @@ - (NSAttributedString *)attributedStringFromEvent:(MXEvent *)event withRoomState
             {
                 if (isRoomDirect)
                 {
-                    displayText = [MatrixKitL10n noticeRoomAliasesForDm:aliases];
+                    displayText = [MatrixKitL10n noticeRoomAliasesForDm:[aliases componentsJoinedByString:@", "]];
                 }
                 else
                 {
-                    displayText = [MatrixKitL10n noticeRoomAliases:aliases];
+                    displayText = [MatrixKitL10n noticeRoomAliases:[aliases componentsJoinedByString:@", "]];
                 }
                 // Append redacted info if any
                 if (redactedInfo)
@@ -1017,7 +1017,7 @@ - (NSAttributedString *)attributedStringFromEvent:(MXEvent *)event withRoomState
             MXJSONModelSetArray(groups, event.content[@"groups"]);
             if (groups)
             {
-                displayText = [MatrixKitL10n noticeRoomRelatedGroups:groups];
+                displayText = [MatrixKitL10n noticeRoomRelatedGroups:[groups componentsJoinedByString:@", "]];
                 // Append redacted info if any
                 if (redactedInfo)
                 {

diff --git a/Podfile b/Podfile
@@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do
 
     # Different flavours of pods to Matrix SDK
     # The tagged version on which this version of MatrixKit has been built
-    pod 'MatrixSDK', '= 0.20.5'
+    pod 'MatrixSDK', '= 0.20.6'
 
     # The lastest release available on the CocoaPods repository
     #pod 'MatrixSDK'

diff --git a/Podfile.lock b/Podfile.lock
@@ -39,9 +39,9 @@ PODS:
   - JSQSystemSoundPlayer (2.0.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - MatrixSDK (0.20.5):
-    - MatrixSDK/Core (= 0.20.5)
-  - MatrixSDK/Core (0.20.5):
+  - MatrixSDK (0.20.6):
+    - MatrixSDK/Core (= 0.20.6)
+  - MatrixSDK/Core (0.20.6):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -65,7 +65,7 @@ DEPENDENCIES:
   - HPGrowingTextView (~> 1.1)
   - JSQMessagesViewController (~> 7.3.5)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.20.5)
+  - MatrixSDK (= 0.20.6)
   - SwiftGen (~> 6.3)
 
 SPEC REPOS:
@@ -97,12 +97,12 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  MatrixSDK: 417fac309f510b5f8ac121ba8abe3b897953e1ce
+  MatrixSDK: 37d6bc484fa90c39db46ed25fd3a4c707bb70452
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   Realm: b6027801398f3743fc222f096faa85281b506e6c
   SwiftGen: a6d22010845f08fe18fbdf3a07a8e380fd22e0ea
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
 
-PODFILE CHECKSUM: 31fd74645e3a14547db8a45cf20455c1702772dd
+PODFILE CHECKSUM: 9ed0d5caf99a14f842e55d869d676a986a36d72f
 
 COCOAPODS: 1.11.2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@

		#import <Foundation/Foundation.h>

		NSString *const MatrixKitVersion = @"0.16.5";
		NSString *const MatrixKitVersion = @"0.16.6";