Skip to content

Commit

Permalink
Merge branch 'release/1.9.2/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanceriu committed Aug 31, 2022
2 parents 1321dc5 + 7e4901a commit e1a2814
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## Changes in 1.9.2 (2022-08-31)

🙌 Improvements

- Upgrade MatrixSDK version ([v0.23.17](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.17)).


## Changes in 1.9.1 (2022-08-29)

🙌 Improvements
Expand Down
4 changes: 2 additions & 2 deletions Config/AppVersion.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
//

// Version
MARKETING_VERSION = 1.9.1
CURRENT_PROJECT_VERSION = 1.9.1
MARKETING_VERSION = 1.9.2
CURRENT_PROJECT_VERSION = 1.9.2
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.16'
$matrixSDKVersion = '= 0.23.17'
# $matrixSDKVersion = :local
# $matrixSDKVersion = { :branch => 'develop'}
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
Expand Down
18 changes: 9 additions & 9 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@ PODS:
- LoggerAPI (1.9.200):
- Logging (~> 1.1)
- Logging (1.4.0)
- MatrixSDK (0.23.16):
- MatrixSDK/Core (= 0.23.16)
- MatrixSDK/Core (0.23.16):
- MatrixSDK (0.23.17):
- MatrixSDK/Core (= 0.23.17)
- MatrixSDK/Core (0.23.17):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- MatrixSDK/CryptoSDK
- OLMKit (~> 3.2.5)
- Realm (= 10.27.0)
- SwiftyBeaver (= 1.9.5)
- MatrixSDK/CryptoSDK (0.23.16):
- MatrixSDK/CryptoSDK (0.23.17):
- MatrixSDKCrypto (= 0.1.0)
- MatrixSDK/JingleCallStack (0.23.16):
- MatrixSDK/JingleCallStack (0.23.17):
- JitsiMeetSDK (= 5.0.2)
- MatrixSDK/Core
- MatrixSDKCrypto (0.1.0)
Expand Down Expand Up @@ -123,8 +123,8 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.23.16)
- MatrixSDK/JingleCallStack (= 0.23.16)
- MatrixSDK (= 0.23.17)
- MatrixSDK/JingleCallStack (= 0.23.17)
- OLMKit
- PostHog (~> 1.4.4)
- ReadMoreTextView (~> 3.0.1)
Expand Down Expand Up @@ -221,7 +221,7 @@ SPEC CHECKSUMS:
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatrixSDK: 522910756169e688afc6ebd12aa549c16bc759dd
MatrixSDK: 82cc75542d5df1da80f68fad1541df7bfb67efb6
MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
OLMKit: da115f16582e47626616874e20f7bb92222c7a51
PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
Expand All @@ -241,6 +241,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 32a777fedc1a3ac9b62775803835a9704ef6acdd
PODFILE CHECKSUM: 5c7121d9069b1034690a3c16f6af791167172e53

COCOAPODS: 1.11.2

0 comments on commit e1a2814

Please sign in to comment.