Skip to content

Commit 9943a39

Browse files
author
gulekismail
committed
Merge branch 'master' into develop
2 parents efb1476 + 17bde4f commit 9943a39

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use_frameworks!
1313
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
1414
#
1515
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
16-
$matrixSDKVersion = '= 0.23.2'
16+
$matrixSDKVersion = '= 0.23.3'
1717
# $matrixSDKVersion = :local
1818
# $matrixSDKVersion = { :branch => 'develop'}
1919
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }

Podfile.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ PODS:
4646
- GBDeviceInfo/Core (6.6.0)
4747
- GZIP (1.3.0)
4848
- Introspect (0.1.4)
49-
- JitsiMeetSDK (3.10.2)
49+
- JitsiMeetSDK (5.0.2)
5050
- KeychainAccess (4.2.2)
5151
- KituraContracts (1.2.1):
5252
- LoggerAPI (~> 1.7)
@@ -56,17 +56,17 @@ PODS:
5656
- LoggerAPI (1.9.200):
5757
- Logging (~> 1.1)
5858
- Logging (1.4.0)
59-
- MatrixSDK (0.23.2):
60-
- MatrixSDK/Core (= 0.23.2)
61-
- MatrixSDK/Core (0.23.2):
59+
- MatrixSDK (0.23.3):
60+
- MatrixSDK/Core (= 0.23.3)
61+
- MatrixSDK/Core (0.23.3):
6262
- AFNetworking (~> 4.0.0)
6363
- GZIP (~> 1.3.0)
6464
- libbase58 (~> 0.1.4)
6565
- OLMKit (~> 3.2.5)
6666
- Realm (= 10.16.0)
6767
- SwiftyBeaver (= 1.9.5)
68-
- MatrixSDK/JingleCallStack (0.23.2):
69-
- JitsiMeetSDK (= 3.10.2)
68+
- MatrixSDK/JingleCallStack (0.23.3):
69+
- JitsiMeetSDK (= 5.0.2)
7070
- MatrixSDK/Core
7171
- OLMKit (3.2.5):
7272
- OLMKit/olmc (= 3.2.5)
@@ -115,8 +115,8 @@ DEPENDENCIES:
115115
- KeychainAccess (~> 4.2.2)
116116
- KTCenterFlowLayout (~> 1.3.1)
117117
- libPhoneNumber-iOS (~> 0.9.13)
118-
- MatrixSDK (= 0.23.2)
119-
- MatrixSDK/JingleCallStack (= 0.23.2)
118+
- MatrixSDK (= 0.23.3)
119+
- MatrixSDK/JingleCallStack (= 0.23.3)
120120
- OLMKit
121121
- PostHog (~> 1.4.4)
122122
- ReadMoreTextView (~> 3.0.1)
@@ -200,15 +200,15 @@ SPEC CHECKSUMS:
200200
GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
201201
GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
202202
Introspect: b62c4dd2063072327c21d618ef2bedc3c87bc366
203-
JitsiMeetSDK: 2f118fa770f23e518f3560fc224fae3ac7062223
203+
JitsiMeetSDK: edcac8e2b92ee0c7f3e75bd0aefefbe9faccfc93
204204
KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
205205
KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
206206
KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
207207
libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
208208
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
209209
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
210210
Logging: beeb016c9c80cf77042d62e83495816847ef108b
211-
MatrixSDK: ab6cbb1e8c437eac4f999be516b5e76c2bca9f6a
211+
MatrixSDK: 4a2d2ddc1bd58c63f40e14706306e1beaffea02d
212212
OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
213213
PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
214214
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -225,6 +225,6 @@ SPEC CHECKSUMS:
225225
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
226226
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
227227

228-
PODFILE CHECKSUM: 22ac36d3f1661d3fe975d9498760f0cf6efa6fd8
228+
PODFILE CHECKSUM: 8055bae15b82bd29b1d12c64ff038fe6f86a8ca0
229229

230-
COCOAPODS: 1.11.3
230+
COCOAPODS: 1.11.2

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES"
8-
runPostActionsOnFailure = "NO">
7+
buildImplicitDependencies = "YES">
98
<BuildActionEntries>
109
<BuildActionEntry
1110
buildForTesting = "YES"

changelog.d/x-nolink-0.change

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade MatrixSDK version ([v0.23.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.3)).

0 commit comments

Comments
 (0)