mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-05-09 09:27:42 +02:00
Merge branch 'master' into develop
This commit is contained in:
+4
-1
@@ -1,4 +1,4 @@
|
||||
Changes to be released in next version
|
||||
Changes in 1.4.7 (2021-07-22)
|
||||
=================================================
|
||||
|
||||
✨ Features
|
||||
@@ -22,6 +22,9 @@ Changes to be released in next version
|
||||
Others
|
||||
*
|
||||
|
||||
Improvements:
|
||||
* Upgrade MatrixKit version ([v0.15.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.5)).
|
||||
|
||||
Changes in 1.4.6 (2021-07-16)
|
||||
=================================================
|
||||
|
||||
|
||||
@@ -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.4'
|
||||
$matrixKitVersion = '= 0.15.5'
|
||||
# $matrixKitVersion = :local
|
||||
# $matrixKitVersion = {'develop' => 'develop'}
|
||||
|
||||
|
||||
+13
-13
@@ -56,29 +56,29 @@ PODS:
|
||||
- MatomoTracker (7.4.1):
|
||||
- MatomoTracker/Core (= 7.4.1)
|
||||
- MatomoTracker/Core (7.4.1)
|
||||
- MatrixKit (0.15.4):
|
||||
- MatrixKit (0.15.5):
|
||||
- Down (~> 0.11.0)
|
||||
- DTCoreText (~> 1.6.25)
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.13)
|
||||
- MatrixKit/Core (= 0.15.4)
|
||||
- MatrixSDK (= 0.19.4)
|
||||
- MatrixKit/Core (0.15.4):
|
||||
- MatrixKit/Core (= 0.15.5)
|
||||
- MatrixSDK (= 0.19.5)
|
||||
- MatrixKit/Core (0.15.5):
|
||||
- Down (~> 0.11.0)
|
||||
- DTCoreText (~> 1.6.25)
|
||||
- HPGrowingTextView (~> 1.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.13)
|
||||
- MatrixSDK (= 0.19.4)
|
||||
- MatrixSDK (0.19.4):
|
||||
- MatrixSDK/Core (= 0.19.4)
|
||||
- MatrixSDK/Core (0.19.4):
|
||||
- MatrixSDK (= 0.19.5)
|
||||
- MatrixSDK (0.19.5):
|
||||
- MatrixSDK/Core (= 0.19.5)
|
||||
- MatrixSDK/Core (0.19.5):
|
||||
- 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.4):
|
||||
- MatrixSDK/JingleCallStack (0.19.5):
|
||||
- JitsiMeetSDK (= 3.5.0)
|
||||
- MatrixSDK/Core
|
||||
- OLMKit (3.2.4):
|
||||
@@ -120,7 +120,7 @@ DEPENDENCIES:
|
||||
- KeychainAccess (~> 4.2.2)
|
||||
- KTCenterFlowLayout (~> 1.3.1)
|
||||
- MatomoTracker (~> 7.4.1)
|
||||
- MatrixKit (= 0.15.4)
|
||||
- MatrixKit (= 0.15.5)
|
||||
- MatrixSDK
|
||||
- MatrixSDK/JingleCallStack
|
||||
- OLMKit
|
||||
@@ -196,8 +196,8 @@ SPEC CHECKSUMS:
|
||||
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
|
||||
Logging: beeb016c9c80cf77042d62e83495816847ef108b
|
||||
MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
|
||||
MatrixKit: 477690d6dd38b1526042f8e83ff34e3db87e3a00
|
||||
MatrixSDK: 0c9d1845a45d71abcfcabe82b706cadbda1297ae
|
||||
MatrixKit: 7606227237cf58c1a1a2235547222c5d75b464c4
|
||||
MatrixSDK: 9fa30f9ca2504c4251b99212dcf4ff569bbf45b1
|
||||
OLMKit: 2d73cd67d149b5c3e3a8eb8ecae93d0b429d8a02
|
||||
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
|
||||
Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
|
||||
@@ -211,6 +211,6 @@ SPEC CHECKSUMS:
|
||||
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
|
||||
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
|
||||
|
||||
PODFILE CHECKSUM: 2b61b852a5b62fbb75643a30281e362fd4566f12
|
||||
PODFILE CHECKSUM: 6e4ab90565384faccee0cb985abe05663c36f517
|
||||
|
||||
COCOAPODS: 1.10.1
|
||||
|
||||
Reference in New Issue
Block a user