Merge branch 'feature/5854_foss_merge' into 'develop'

5854 foss merge

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!335
This commit is contained in:
JanNiklas Grabowski
2024-03-18 12:59:15 +00:00
34 changed files with 130 additions and 310 deletions

View File

@@ -16,7 +16,7 @@ use_frameworks!
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK 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
$matrixSDKVersion = '= 0.27.5'
$matrixSDKVersion = '= 0.27.6'
# $matrixSDKVersion = :local
# $matrixSDKVersion = { :branch => 'develop'}
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -63,7 +63,7 @@ end
def import_SwiftUI_pods
pod 'Introspect', '~> 0.1'
pod 'DSBottomSheet', '~> 0.3'
pod 'ZXingObjC', '~> 3.6.5'
pod 'ZXingObjC', '~> 3.6.9'
end
abstract_target 'RiotPods' do