From 7a2fc6452768305a03f3e6ec7b5b517339e9c9b8 Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 21 Jun 2021 17:37:08 +0200 Subject: [PATCH 1/2] version++ --- CHANGES.rst | 5 ++++- Podfile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 6522acffc..72f23a86d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,4 +1,4 @@ -Changes to be released in next version +Changes in 1.4.2 (2021-06-21) ================================================= ✨ Features @@ -39,6 +39,9 @@ Changes to be released in next version Others * +Improvements: + * Upgrade MatrixKit version ([v0.15.1](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.1)). + Changes in 1.4.1 (2021-06-08) ================================================= diff --git a/Podfile b/Podfile index 8c1ab9284..6746493b4 100644 --- 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.15.0' +$matrixKitVersion = '= 0.15.1' # $matrixKitVersion = :local # $matrixKitVersion = {'develop' => 'develop'} From bb33ee5cafda4d226cb776eb4aa0fe7f49f422b7 Mon Sep 17 00:00:00 2001 From: manuroe Date: Mon, 21 Jun 2021 18:02:53 +0200 Subject: [PATCH 2/2] finish version++ --- Podfile.lock | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 518fd3813..06370d1af 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -36,6 +36,7 @@ PODS: - DTFoundation/Core - DTFoundation/UIKit (1.7.17): - DTFoundation/Core + - FLEX (4.4.1) - FlowCommoniOS (1.10.0) - GBDeviceInfo (6.6.0): - GBDeviceInfo/Core (= 6.6.0) @@ -55,29 +56,29 @@ PODS: - MatomoTracker (7.4.1): - MatomoTracker/Core (= 7.4.1) - MatomoTracker/Core (7.4.1) - - MatrixKit (0.15.0): + - MatrixKit (0.15.1): - Down (~> 0.11.0) - DTCoreText (~> 1.6.25) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixKit/Core (= 0.15.0) - - MatrixSDK (= 0.19.0) - - MatrixKit/Core (0.15.0): + - MatrixKit/Core (= 0.15.1) + - MatrixSDK (= 0.19.1) + - MatrixKit/Core (0.15.1): - Down (~> 0.11.0) - DTCoreText (~> 1.6.25) - HPGrowingTextView (~> 1.1) - libPhoneNumber-iOS (~> 0.9.13) - - MatrixSDK (= 0.19.0) - - MatrixSDK (0.19.0): - - MatrixSDK/Core (= 0.19.0) - - MatrixSDK/Core (0.19.0): + - MatrixSDK (= 0.19.1) + - MatrixSDK (0.19.1): + - MatrixSDK/Core (= 0.19.1) + - MatrixSDK/Core (0.19.1): - AFNetworking (~> 4.0.0) - GZIP (~> 1.3.0) - libbase58 (~> 0.1.4) - OLMKit (~> 3.2.4) - Realm (= 10.7.6) - SwiftyBeaver (= 1.9.5) - - MatrixSDK/JingleCallStack (0.19.0): + - MatrixSDK/JingleCallStack (0.19.1): - JitsiMeetSDK (= 3.5.0) - MatrixSDK/Core - OLMKit (3.2.4): @@ -94,6 +95,7 @@ PODS: - Reusable/View (= 4.1.1) - Reusable/Storyboard (4.1.1) - Reusable/View (4.1.1) + - SideMenu (6.5.0) - SwiftBase32 (0.9.0) - SwiftGen (6.4.0) - SwiftJWT (3.6.200): @@ -111,18 +113,20 @@ PODS: DEPENDENCIES: - DGCollectionViewLeftAlignFlowLayout (~> 1.0.4) + - FLEX (~> 4.4.1) - FlowCommoniOS (~> 1.10.0) - GBDeviceInfo (~> 6.6.0) - HPGrowingTextView - KeychainAccess (~> 4.2.2) - KTCenterFlowLayout (~> 1.3.1) - MatomoTracker (~> 7.4.1) - - MatrixKit (= 0.15.0) + - MatrixKit (= 0.15.1) - MatrixSDK - MatrixSDK/JingleCallStack - OLMKit - ReadMoreTextView (~> 3.0.1) - Reusable (~> 4.1) + - SideMenu (~> 6.5) - SwiftBase32 (~> 0.9.0) - SwiftGen (~> 6.3) - SwiftJWT (~> 3.6.200) @@ -140,6 +144,7 @@ SPEC REPOS: - Down - DTCoreText - DTFoundation + - FLEX - FlowCommoniOS - GBDeviceInfo - GZIP @@ -159,6 +164,7 @@ SPEC REPOS: - ReadMoreTextView - Realm - Reusable + - SideMenu - SwiftBase32 - SwiftGen - SwiftJWT @@ -176,6 +182,7 @@ SPEC CHECKSUMS: Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612 DTCoreText: e92f4cf6b36d9d71ce4436d12cf089d74ab0596b DTFoundation: 989698be00d3f19438c38a49a8ebb3f6919dcac5 + FLEX: 7ca2c8cd3a435ff501ff6d2f2141e9bdc934eaab FlowCommoniOS: bcdf81a5f30717e711af08a8c812eb045411ba94 GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3 @@ -189,12 +196,13 @@ SPEC CHECKSUMS: LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb - MatrixKit: 58ad027bad57c97e9726d5fdc348ce4fe1eea78f - MatrixSDK: 60c9ac811395879ede3f8c0c6ea6578fd3c0063f + MatrixKit: c760d2146ccdb8768f6b6f3740973629f66f7107 + MatrixSDK: e02c4998a4fea689000feb9c70f7df62c4443481 OLMKit: 2d73cd67d149b5c3e3a8eb8ecae93d0b429d8a02 ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d Realm: ed860452717c8db8f4bf832b6807f7f2ce708839 Reusable: 53a9acf5c536f229b31b5865782414b508252ddb + SideMenu: f583187d21c5b1dd04c72002be544b555a2627a2 SwiftBase32: 9399c25a80666dc66b51e10076bf591e3bbb8f17 SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108 SwiftJWT: 88c412708f58c169d431d344c87bc79a87c830ae @@ -203,6 +211,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -PODFILE CHECKSUM: 06116cf4dfb1c6199940156281c125b0518b4791 +PODFILE CHECKSUM: 7a2bcdd65185719d2a464e618d8200678391d0d6 COCOAPODS: 1.10.1