mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 15:22:39 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
1280fc6989
3 changed files with 20 additions and 9 deletions
11
CHANGES.md
11
CHANGES.md
|
@ -1,3 +1,14 @@
|
|||
## Changes in 1.11.10 (2024-05-01)
|
||||
|
||||
🙌 Improvements
|
||||
|
||||
- Upgrade MatrixSDK version ([v0.27.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.7)).
|
||||
|
||||
Others
|
||||
|
||||
- Improvements to reporting of decryption failures.
|
||||
|
||||
|
||||
## Changes in 1.11.9 (2024-04-02)
|
||||
|
||||
Others
|
||||
|
|
2
Podfile
2
Podfile
|
@ -16,7 +16,7 @@ use_frameworks!
|
|||
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK 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
|
||||
$matrixSDKVersion = '= 0.27.6'
|
||||
$matrixSDKVersion = '= 0.27.7'
|
||||
# $matrixSDKVersion = :local
|
||||
# $matrixSDKVersion = { :branch => 'develop'}
|
||||
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
|
||||
|
|
16
Podfile.lock
16
Podfile.lock
|
@ -39,9 +39,9 @@ PODS:
|
|||
- LoggerAPI (1.9.200):
|
||||
- Logging (~> 1.1)
|
||||
- Logging (1.4.0)
|
||||
- MatrixSDK (0.27.6):
|
||||
- MatrixSDK/Core (= 0.27.6)
|
||||
- MatrixSDK/Core (0.27.6):
|
||||
- MatrixSDK (0.27.7):
|
||||
- MatrixSDK/Core (= 0.27.7)
|
||||
- MatrixSDK/Core (0.27.7):
|
||||
- AFNetworking (~> 4.0.0)
|
||||
- GZIP (~> 1.3.0)
|
||||
- libbase58 (~> 0.1.4)
|
||||
|
@ -49,7 +49,7 @@ PODS:
|
|||
- OLMKit (~> 3.2.5)
|
||||
- Realm (= 10.27.0)
|
||||
- SwiftyBeaver (= 1.9.5)
|
||||
- MatrixSDK/JingleCallStack (0.27.6):
|
||||
- MatrixSDK/JingleCallStack (0.27.7):
|
||||
- JitsiMeetSDKLite (= 8.1.2-lite)
|
||||
- MatrixSDK/Core
|
||||
- MatrixSDKCrypto (0.3.13)
|
||||
|
@ -102,8 +102,8 @@ DEPENDENCIES:
|
|||
- KeychainAccess (~> 4.2.2)
|
||||
- KTCenterFlowLayout (~> 1.3.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.13)
|
||||
- MatrixSDK (= 0.27.6)
|
||||
- MatrixSDK/JingleCallStack (= 0.27.6)
|
||||
- MatrixSDK (= 0.27.7)
|
||||
- MatrixSDK/JingleCallStack (= 0.27.7)
|
||||
- OLMKit
|
||||
- PostHog (~> 2.0.0)
|
||||
- ReadMoreTextView (~> 3.0.1)
|
||||
|
@ -187,7 +187,7 @@ SPEC CHECKSUMS:
|
|||
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
|
||||
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
|
||||
Logging: beeb016c9c80cf77042d62e83495816847ef108b
|
||||
MatrixSDK: 4129ab9c0acda1d0aad50b1c9765bd795b8d70b9
|
||||
MatrixSDK: e07b2309f3c6498c1df987441da7006d099c47a4
|
||||
MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4
|
||||
OLMKit: da115f16582e47626616874e20f7bb92222c7a51
|
||||
PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
|
||||
|
@ -208,6 +208,6 @@ SPEC CHECKSUMS:
|
|||
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
|
||||
ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
|
||||
|
||||
PODFILE CHECKSUM: c87b532985dd755b373732f841e3bcfe616f4e4f
|
||||
PODFILE CHECKSUM: 1197abec9c5affbef652747dd5cd6aaf00ef3a47
|
||||
|
||||
COCOAPODS: 1.14.3
|
||||
|
|
Loading…
Reference in a new issue