Merge branch 'master' into develop

matrix-org · Sep 24, 2021 · f73bb5c · f73bb5c
2 parents 1487fa4 + 263bd1e
commit f73bb5c
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 20 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,27 @@
+## Changes in 0.16.2 (2021-09-24)
+
+✨ Features
+
+- Added device de/rehydration supporting flows. ([#4255](https://github.com/vector-im/element-ios/issues/4255))
+- Support for space link. ([#4498](https://github.com/vector-im/element-ios/issues/4498))
+- Add suggested rooms and support for suggested room selection to the list of recent cell data ([#4501](https://github.com/vector-im/element-ios/issues/4501))
+- moved space filtering to MatrixKit. ([#4509](https://github.com/vector-im/element-ios/issues/4509))
+- Tweaked `MXKRoomMemberDetailsViewController` so we can hide leave option ([#4682](https://github.com/vector-im/element-ios/issues/4682))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.2)).
+
+🐛 Bugfixes
+
+- MXKAppSettings: Return matrix.to when firstURLDetectionIgnoredHosts is nil, and store an empty array when setting nil. ([#4826](https://github.com/vector-im/element-ios/issues/4826))
+
+⚠️ API Changes
+
+- Dropped support for iOS versions 11 and lower. ([#4693](https://github.com/vector-im/element-ios/issues/4693))
+- Exposed more room joining result types in the completion handler. ([#4830](https://github.com/vector-im/element-ios/issues/4830))
+
+
 ## Changes in 0.16.1 (2021-09-16)
 
 🙌 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.1"
+  s.version      = "0.16.2"
   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.1"
+  s.dependency 'MatrixSDK', "= 0.20.2"
   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.1";
+NSString *const MatrixKitVersion = @"0.16.2";
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.1'
+    pod 'MatrixSDK', '= 0.20.2'
 
     # The lastest release available on the CocoaPods repository
     #pod 'MatrixSDK'

diff --git a/Podfile.lock b/Podfile.lock
@@ -39,13 +39,13 @@ PODS:
   - JSQSystemSoundPlayer (2.0.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - MatrixSDK (0.20.1):
-    - MatrixSDK/Core (= 0.20.1)
-  - MatrixSDK/Core (0.20.1):
+  - MatrixSDK (0.20.2):
+    - MatrixSDK/Core (= 0.20.2)
+  - MatrixSDK/Core (0.20.2):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
-    - OLMKit (~> 3.2.4)
+    - OLMKit (~> 3.2.5)
     - Realm (= 10.7.6)
     - SwiftyBeaver (= 1.9.5)
   - OLMKit (3.2.5):
@@ -64,7 +64,7 @@ DEPENDENCIES:
   - HPGrowingTextView (~> 1.1)
   - JSQMessagesViewController (~> 7.3.5)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.20.1)
+  - MatrixSDK (= 0.20.2)
 
 SPEC REPOS:
   trunk:
@@ -94,11 +94,11 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  MatrixSDK: 37fbb6a650095387e908937b7411c4370599c90b
+  MatrixSDK: bf3ebecbe643273c4439367175ccd4e5307831c8
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
 
-PODFILE CHECKSUM: 0e2d898b626cf9ce3b42ee5ae7eb2bf2b414e39e
+PODFILE CHECKSUM: 79ff8ad84a5bd5e3d7695273a889c5008a769709
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.10.1
diff --git a/changelog.d/4255.feature b/changelog.d/4255.feature
diff --git a/changelog.d/4498.feature b/changelog.d/4498.feature
diff --git a/changelog.d/4501.feature b/changelog.d/4501.feature
diff --git a/changelog.d/4509.feature b/changelog.d/4509.feature
diff --git a/changelog.d/4682.feature b/changelog.d/4682.feature
diff --git a/changelog.d/4693.api b/changelog.d/4693.api
diff --git a/changelog.d/4826.bugfix b/changelog.d/4826.bugfix
diff --git a/changelog.d/4830.api b/changelog.d/4830.api
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.1";
		NSString *const MatrixKitVersion = @"0.16.2";