Skip to content

Commit

Permalink
Merge branch 'release/1.3.3/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
manuroe committed Apr 16, 2021
2 parents 13f1268 + 39af431 commit 9360488
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 16 deletions.
27 changes: 27 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
Changes in 1.3.3 (2021-04-16)
=================================================

✨ Features
*

🙌 Improvements
*

🐛 Bugfix
*

⚠️ API Changes
*

🗣 Translations
*

🧱 Build
*

Others
*

Improvements:
* Upgrade MatrixKit version ([v0.14.9](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.9)).

Changes in 1.3.2 (2021-04-16)
=================================================

Expand Down
4 changes: 2 additions & 2 deletions Config/AppIdentifiers.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
APPLICATION_SCHEME = element

// Version
MARKETING_VERSION = 1.3.2
CURRENT_PROJECT_VERSION = 1.3.2
MARKETING_VERSION = 1.3.3
CURRENT_PROJECT_VERSION = 1.3.3


// Team
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.9'
$matrixKitVersion = '= 0.14.9'
# $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'}

Expand Down
26 changes: 13 additions & 13 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,28 +55,28 @@ PODS:
- MatomoTracker (7.4.1):
- MatomoTracker/Core (= 7.4.1)
- MatomoTracker/Core (7.4.1)
- MatrixKit (0.14.8):
- MatrixKit (0.14.9):
- Down (~> 0.10.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.14.8)
- MatrixSDK (= 0.18.8)
- MatrixKit/Core (0.14.8):
- MatrixKit/Core (= 0.14.9)
- MatrixSDK (= 0.18.9)
- MatrixKit/Core (0.14.9):
- Down (~> 0.10.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.18.8)
- MatrixSDK (0.18.8):
- MatrixSDK/Core (= 0.18.8)
- MatrixSDK/Core (0.18.8):
- MatrixSDK (= 0.18.9)
- MatrixSDK (0.18.9):
- MatrixSDK/Core (= 0.18.9)
- MatrixSDK/Core (0.18.9):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- OLMKit (~> 3.2.2)
- Realm (= 10.7.2)
- MatrixSDK/JingleCallStack (0.18.8):
- MatrixSDK/JingleCallStack (0.18.9):
- JitsiMeetSDK (= 3.2.0)
- MatrixSDK/Core
- OLMKit (3.2.2):
Expand Down Expand Up @@ -115,7 +115,7 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- MatomoTracker (~> 7.4.1)
- MatrixKit (= 0.14.8)
- MatrixKit (= 0.14.9)
- MatrixSDK
- MatrixSDK/JingleCallStack
- OLMKit
Expand Down Expand Up @@ -186,8 +186,8 @@ SPEC CHECKSUMS:
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
MatrixKit: 23f7cba7d6132d7ded14a27ff56dde76850118e4
MatrixSDK: 3b50bb8d80d2dd58e8639baf66ff9399b8752fc3
MatrixKit: ee8e8d82c2d5fe24ec205d53b15dcaa87e9a913d
MatrixSDK: 74ea0905116cba4cf5709410894a95bbc007307e
OLMKit: 20d1c564033a1ae7148f8f599378d4c798363905
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
Realm: e523da9ade306c5ae87e85dc09fdef148d3e1cc1
Expand All @@ -199,6 +199,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 1956486be09b57b05152ce8486f70f5397e26c72
PODFILE CHECKSUM: 761363c2101ec4039b1b7bcc34f084465ac7f11e

COCOAPODS: 1.10.1

0 comments on commit 9360488

Please sign in to comment.