felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-12 18:59:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
manuroe
2021-04-09 17:56:20 +02:00
parent 482736ad5f 533097bf78
commit f9b3039684
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.rst
+4 -1
View File
@@ -1,4 +1,4 @@
Changes to be released in next version
Changes in 1.3.0 (2021-04-09)
=================================================
✨ Features
@@ -36,6 +36,9 @@ Changes to be released in next version
Others
*
Improvements:
* Upgrade MatrixKit version ([v0.14.7](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.14.7)).
Changes in 1.2.8 (2021-03-26)
=================================================
Config/AppIdentifiers.xcconfig
+2 -2
View File
@@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
APPLICATION_SCHEME = element
// Version
MARKETING_VERSION = 1.2.9
CURRENT_PROJECT_VERSION = 1.2.9
MARKETING_VERSION = 1.3.0
CURRENT_PROJECT_VERSION = 1.3.0
// Team
Podfile
+1 -1
View File
@@ -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.6'
$matrixKitVersion = '= 0.14.7'
# $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'}
Podfile.lock
+13 -13
View File
@@ -55,28 +55,28 @@ PODS:
- MatomoTracker (7.4.1):
- MatomoTracker/Core (= 7.4.1)
- MatomoTracker/Core (7.4.1)
- MatrixKit (0.14.6):
- MatrixKit (0.14.7):
- Down (~> 0.10.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.14.6)
- MatrixSDK (= 0.18.6)
- MatrixKit/Core (0.14.6):
- MatrixKit/Core (= 0.14.7)
- MatrixSDK (= 0.18.7)
- MatrixKit/Core (0.14.7):
- Down (~> 0.10.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.18.6)
- MatrixSDK (0.18.6):
- MatrixSDK/Core (= 0.18.6)
- MatrixSDK/Core (0.18.6):
- MatrixSDK (= 0.18.7)
- MatrixSDK (0.18.7):
- MatrixSDK/Core (= 0.18.7)
- MatrixSDK/Core (0.18.7):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- OLMKit (~> 3.2.2)
- Realm (= 10.7.2)
- MatrixSDK/JingleCallStack (0.18.6):
- MatrixSDK/JingleCallStack (0.18.7):
- JitsiMeetSDK (= 3.2.0)
- MatrixSDK/Core
- OLMKit (3.2.2):
@@ -115,7 +115,7 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- MatomoTracker (~> 7.4.1)
- MatrixKit (= 0.14.6)
- MatrixKit (= 0.14.7)
- MatrixSDK
- MatrixSDK/JingleCallStack
- OLMKit
@@ -186,8 +186,8 @@ SPEC CHECKSUMS:
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
MatrixKit: 0bf9eb5a4375d829f7d8daf2b0995f630468b825
MatrixSDK: 4437d3c4299b06954809e2eaa96f9193703e920e
MatrixKit: 65e08105b4501b97edba40602b1992203ab7f39a
MatrixSDK: 50d77fcdbde706d009f4cc86dc46f91f69b28a91
OLMKit: 20d1c564033a1ae7148f8f599378d4c798363905
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
Realm: e523da9ade306c5ae87e85dc09fdef148d3e1cc1
@@ -199,6 +199,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: 44dae827997fc5fc1a07fabc00a4870eb94a9956
PODFILE CHECKSUM: d5892484a72d78c5d98faf60014db77b2d4a0565
COCOAPODS: 1.10.1