Merge branch 'release/1.1.5/master'

element-hq · Jan 18, 2021 · a5763b9 · a5763b9
2 parents ea8e4e0 + 437d9e7
commit a5763b9
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 21 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,30 @@
+Changes in 1.1.5 (2021-01-18)
+=================================================
+
+✨ Features
+ * 
+
+🙌 Improvements
+ * 
+
+🐛 Bugfix
+ * 
+
+⚠️ API Changes
+ * 
+
+🗣 Translations
+ * 
+
+🧱 Build
+ * 
+
+Others
+ * 
+
+Improvements:
+ * Upgrade MatrixKit version ([v0.13.7](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.13.7)).
+
 Changes in 1.1.4 (2021-01-15)
 =================================================
 

diff --git a/Podfile b/Podfile
@@ -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
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixKitVersion = '= 0.13.6'
+$matrixKitVersion = '= 0.13.7'
 # $matrixKitVersion = :local
 # $matrixKitVersion = {'develop' => 'develop'}
 

diff --git a/Podfile.lock b/Podfile.lock
@@ -60,35 +60,35 @@ PODS:
   - MatomoTracker (7.2.2):
     - MatomoTracker/Core (= 7.2.2)
   - MatomoTracker/Core (7.2.2)
-  - MatrixKit (0.13.6):
+  - MatrixKit (0.13.7):
     - Down (~> 0.9.3)
     - DTCoreText (~> 1.6.23)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.13.6)
-    - MatrixSDK (= 0.17.8)
-  - MatrixKit/AppExtension (0.13.6):
+    - MatrixKit/Core (= 0.13.7)
+    - MatrixSDK (= 0.17.9)
+  - MatrixKit/AppExtension (0.13.7):
     - Down (~> 0.9.3)
     - DTCoreText (~> 1.6.23)
     - DTCoreText/Extension
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.17.8)
-  - MatrixKit/Core (0.13.6):
+    - MatrixSDK (= 0.17.9)
+  - MatrixKit/Core (0.13.7):
     - Down (~> 0.9.3)
     - DTCoreText (~> 1.6.23)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.17.8)
-  - MatrixSDK (0.17.8):
-    - MatrixSDK/Core (= 0.17.8)
-  - MatrixSDK/Core (0.17.8):
+    - MatrixSDK (= 0.17.9)
+  - MatrixSDK (0.17.9):
+    - MatrixSDK/Core (= 0.17.9)
+  - MatrixSDK/Core (0.17.9):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.1.0)
     - Realm (= 10.1.4)
-  - MatrixSDK/JingleCallStack (0.17.8):
+  - MatrixSDK/JingleCallStack (0.17.9):
     - JitsiMeetSDK (= 2.11.0)
     - MatrixSDK/Core
   - OLMKit (3.1.0):
@@ -127,8 +127,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.1)
   - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.2.2)
-  - MatrixKit (= 0.13.6)
-  - MatrixKit/AppExtension (= 0.13.6)
+  - MatrixKit (= 0.13.7)
+  - MatrixKit/AppExtension (= 0.13.7)
   - MatrixSDK
   - MatrixSDK/JingleCallStack
   - OLMKit
@@ -199,8 +199,8 @@ SPEC CHECKSUMS:
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   MatomoTracker: a59ec4da0f580be57bdc6baa708a71a86532a832
-  MatrixKit: e74f3c76225a09e9926c3a508d26532616766b9e
-  MatrixSDK: 2311edc7c4235aafa5924e702e6f137d2dd09df5
+  MatrixKit: 5214861622113013cd845dd4695fa22ac136f78c
+  MatrixSDK: f476628589fe9436f7d70aa344dc97ea4bfa6881
   OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
   Realm: 80f4fb2971ccb9adc27a47d0955ae8e533a7030b
@@ -212,6 +212,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 9ca448e22d90512733064524b9bcbfccd85142fc
+PODFILE CHECKSUM: abba9027331fc1ad0d02f325a3bd5d20dd57d03b
 
 COCOAPODS: 1.10.0
diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj
@@ -7475,7 +7475,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.1.4;
+				CURRENT_PROJECT_VERSION = 1.1.5;
 				DEFINES_MODULE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -7495,7 +7495,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -7534,7 +7534,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 1.1.4;
+				CURRENT_PROJECT_VERSION = 1.1.5;
 				DEFINES_MODULE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -7547,7 +7547,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 1.1.4;
+				MARKETING_VERSION = 1.1.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;