Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
manuroe 2021-01-27 13:58:19 +01:00
commit 85243c9624
3 changed files with 21 additions and 18 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.1.6 (2021-01-27)
================================================= =================================================
✨ Features ✨ Features
@ -23,6 +23,9 @@ Changes to be released in next version
Others Others
* *
Improvements:
* Upgrade MatrixKit version ([v0.13.8](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.13.8)).
Changes in 1.1.5 (2021-01-18) Changes in 1.1.5 (2021-01-18)
================================================= =================================================

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 # - `{ {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 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
$matrixKitVersion = '= 0.13.7' $matrixKitVersion = '= 0.13.8'
# $matrixKitVersion = :local # $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'} # $matrixKitVersion = {'develop' => 'develop'}

32
Podfile.lock
View file

@ -60,35 +60,35 @@ PODS:
- MatomoTracker (7.2.2): - MatomoTracker (7.2.2):
- MatomoTracker/Core (= 7.2.2) - MatomoTracker/Core (= 7.2.2)
- MatomoTracker/Core (7.2.2) - MatomoTracker/Core (7.2.2)
- MatrixKit (0.13.7): - MatrixKit (0.13.8):
- Down (~> 0.9.3) - Down (~> 0.9.3)
- DTCoreText (~> 1.6.23) - DTCoreText (~> 1.6.23)
- HPGrowingTextView (~> 1.1) - HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13) - libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.13.7) - MatrixKit/Core (= 0.13.8)
- MatrixSDK (= 0.17.9) - MatrixSDK (= 0.17.10)
- MatrixKit/AppExtension (0.13.7): - MatrixKit/AppExtension (0.13.8):
- Down (~> 0.9.3) - Down (~> 0.9.3)
- DTCoreText (~> 1.6.23) - DTCoreText (~> 1.6.23)
- DTCoreText/Extension - DTCoreText/Extension
- HPGrowingTextView (~> 1.1) - HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13) - libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.17.9) - MatrixSDK (= 0.17.10)
- MatrixKit/Core (0.13.7): - MatrixKit/Core (0.13.8):
- Down (~> 0.9.3) - Down (~> 0.9.3)
- DTCoreText (~> 1.6.23) - DTCoreText (~> 1.6.23)
- HPGrowingTextView (~> 1.1) - HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13) - libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.17.9) - MatrixSDK (= 0.17.10)
- MatrixSDK (0.17.9): - MatrixSDK (0.17.10):
- MatrixSDK/Core (= 0.17.9) - MatrixSDK/Core (= 0.17.10)
- MatrixSDK/Core (0.17.9): - MatrixSDK/Core (0.17.10):
- AFNetworking (~> 4.0.0) - AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0) - GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4) - libbase58 (~> 0.1.4)
- OLMKit (~> 3.1.0) - OLMKit (~> 3.1.0)
- Realm (= 10.1.4) - Realm (= 10.1.4)
- MatrixSDK/JingleCallStack (0.17.9): - MatrixSDK/JingleCallStack (0.17.10):
- JitsiMeetSDK (= 2.11.0) - JitsiMeetSDK (= 2.11.0)
- MatrixSDK/Core - MatrixSDK/Core
- OLMKit (3.1.0): - OLMKit (3.1.0):
@ -127,8 +127,8 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.1) - KeychainAccess (~> 4.2.1)
- KTCenterFlowLayout (~> 1.3.1) - KTCenterFlowLayout (~> 1.3.1)
- MatomoTracker (~> 7.2.2) - MatomoTracker (~> 7.2.2)
- MatrixKit (= 0.13.7) - MatrixKit (= 0.13.8)
- MatrixKit/AppExtension (= 0.13.7) - MatrixKit/AppExtension (= 0.13.8)
- MatrixSDK - MatrixSDK
- MatrixSDK/JingleCallStack - MatrixSDK/JingleCallStack
- OLMKit - OLMKit
@ -199,8 +199,8 @@ SPEC CHECKSUMS:
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatomoTracker: a59ec4da0f580be57bdc6baa708a71a86532a832 MatomoTracker: a59ec4da0f580be57bdc6baa708a71a86532a832
MatrixKit: 5214861622113013cd845dd4695fa22ac136f78c MatrixKit: 9769b1bc8fdee5f28e2a474762d964e5a3c43079
MatrixSDK: f476628589fe9436f7d70aa344dc97ea4bfa6881 MatrixSDK: cd11675c38dcb684843e922026ecb620251e148e
OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639 OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b
@ -212,6 +212,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: abba9027331fc1ad0d02f325a3bd5d20dd57d03b PODFILE CHECKSUM: 376eeb13ecb078f5d76166cd2982477f181e815f
COCOAPODS: 1.10.0 COCOAPODS: 1.10.0