Merge branch 'release/1.10.14/master'

element-hq · Jun 21, 2023 · ab5f501 · ab5f501
2 parents 5c16915 + adad5ad
commit ab5f501
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 1.10.14 (2023-06-21)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.26.12](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.12)).
+
+
 ## Changes in 1.10.13 (2023-06-13)
 
 ✨ Features

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.10.13
-CURRENT_PROJECT_VERSION = 1.10.13
+MARKETING_VERSION = 1.10.14
+CURRENT_PROJECT_VERSION = 1.10.14
diff --git a/Podfile b/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.26.11'
+$matrixSDKVersion = '= 0.26.12'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }

diff --git a/Podfile.lock b/Podfile.lock
@@ -39,17 +39,17 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.26.11):
-    - MatrixSDK/Core (= 0.26.11)
-  - MatrixSDK/Core (0.26.11):
+  - MatrixSDK (0.26.12):
+    - MatrixSDK/Core (= 0.26.12)
+  - MatrixSDK/Core (0.26.12):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - MatrixSDKCrypto (= 0.3.4)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.26.11):
+  - MatrixSDK/JingleCallStack (0.26.12):
     - JitsiMeetSDKLite (= 8.1.2-lite)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.3.4)
@@ -102,8 +102,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.26.11)
-  - MatrixSDK/JingleCallStack (= 0.26.11)
+  - MatrixSDK (= 0.26.12)
+  - MatrixSDK/JingleCallStack (= 0.26.12)
   - OLMKit
   - PostHog (~> 2.0.0)
   - ReadMoreTextView (~> 3.0.1)
@@ -187,7 +187,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: 00cd40bc66890156236dbaedbfaaab2e15eb6d62
+  MatrixSDK: 0af737bc461b82d0ec9edd6fdf8f70b02771ebd3
   MatrixSDKCrypto: ac805c22c24f79f349cdbfa065855c73a4c81b51
   OLMKit: da115f16582e47626616874e20f7bb92222c7a51
   PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
@@ -208,6 +208,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 5639fbf527ef85ae1a41886c4bc4191d664b6547
+PODFILE CHECKSUM: 0e7e10f516d40d9df60cb874170b91603c632118
 
 COCOAPODS: 1.11.3