Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
manuroe 2021-02-26 18:53:43 +01:00
commit 94064962b8
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.rst
View file

@ -1,4 +1,4 @@
Changes to be released in next version
Changes in 1.2.3 (2021-02-26)
=================================================
✨ Features
@ -22,6 +22,9 @@ Changes to be released in next version
Others
*
Improvements:
* Upgrade MatrixKit version ([v0.14.3](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.3)).
Changes in 1.2.2 (2021-02-24)
=================================================

2
Podfile
View file

@ -11,7 +11,7 @@ use_frameworks!
# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
#
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
$matrixKitVersion = '= 0.14.2'
$matrixKitVersion = '= 0.14.3'
# $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'}

26
Podfile.lock
View file

@ -55,28 +55,28 @@ PODS:
- MatomoTracker (7.2.2):
- MatomoTracker/Core (= 7.2.2)
- MatomoTracker/Core (7.2.2)
- MatrixKit (0.14.2):
- MatrixKit (0.14.3):
- Down (~> 0.9.3)
- DTCoreText (~> 1.6.23)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.14.2)
- MatrixSDK (= 0.18.2)
- MatrixKit/Core (0.14.2):
- MatrixKit/Core (= 0.14.3)
- MatrixSDK (= 0.18.3)
- MatrixKit/Core (0.14.3):
- Down (~> 0.9.3)
- DTCoreText (~> 1.6.23)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.18.2)
- MatrixSDK (0.18.2):
- MatrixSDK/Core (= 0.18.2)
- MatrixSDK/Core (0.18.2):
- MatrixSDK (= 0.18.3)
- MatrixSDK (0.18.3):
- MatrixSDK/Core (= 0.18.3)
- MatrixSDK/Core (0.18.3):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- OLMKit (~> 3.2.2)
- Realm (= 10.1.4)
- MatrixSDK/JingleCallStack (0.18.2):
- MatrixSDK/JingleCallStack (0.18.3):
- JitsiMeetSDK (= 3.1.0)
- MatrixSDK/Core
- OLMKit (3.2.2):
@ -115,7 +115,7 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.1)
- KTCenterFlowLayout (~> 1.3.1)
- MatomoTracker (~> 7.2.2)
- MatrixKit (= 0.14.2)
- MatrixKit (= 0.14.3)
- MatrixSDK
- MatrixSDK/JingleCallStack
- OLMKit
@ -186,8 +186,8 @@ SPEC CHECKSUMS:
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatomoTracker: a59ec4da0f580be57bdc6baa708a71a86532a832
MatrixKit: fe2cb13d657005c04c681e85a20566fe50681edf
MatrixSDK: b37cb20c40c77d1f64af2427f3c547611f8b5ec8
MatrixKit: 93f4cac34b6007d7b1a933bfb54a6861021fc9f7
MatrixSDK: 5614040637b366f721a4ac0895bcdf07120ad718
OLMKit: 20d1c564033a1ae7148f8f599378d4c798363905
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b
@ -199,6 +199,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: ccdf4fe07649c999bdcab6812125f610580edb47
PODFILE CHECKSUM: 7a43b794a6a755e3235826542c0d65cf05496281
COCOAPODS: 1.10.0