cleanup pods

Podfile

@@ -1,21 +1,20 @@
-target 'deltachat-ios' do
-  platform :ios, '11.0'
-  use_frameworks!
-  swift_version = '5'
+platform :ios, '11.0'
+use_frameworks!
 
-  # ignore all warnings from all dependencies
-  inhibit_all_warnings!
+# ignore all warnings from all dependencies
+inhibit_all_warnings!
 
+target 'deltachat-ios' do
   pod 'Swifter', :git => 'https://github.com/httpswift/swifter.git', :branch => 'stable'
   pod 'SwiftLint'
   pod 'SwiftFormat/CLI'
   # pod 'openssl-ios-bitcode'
   pod 'ReachabilitySwift'
   pod 'SCSiriWaveformView'
-  pod 'SDWebImage'
-  pod 'SDWebImageWebPCoder'
+  pod 'SDWebImage', :modular_headers => true
+  pod 'SDWebImageWebPCoder', :modular_headers => true
   pod 'SDWebImageSVGKitPlugin'
-  pod 'SVGKit', :git => 'https://github.com/SVGKit/SVGKit.git', :branch => '3.x'
+  pod 'SVGKit', :modular_headers => true
   target 'deltachat-iosTests' do
     inherit! :search_paths
     # Pods for testing
@@ -23,13 +22,6 @@ target 'deltachat-ios' do
 end
 
 target 'DcShare' do
-  platform :ios, '11.0'
-  use_frameworks!
-  swift_version = '5'
-
-  # ignore all warnings from all dependencies
-  inhibit_all_warnings!
-
-  pod 'SDWebImage'
-  pod 'SDWebImageWebPCoder'
+  pod 'SDWebImage', :modular_headers => true
+  pod 'SDWebImageWebPCoder', :modular_headers => true
 end

Podfile.lock

@@ -22,7 +22,7 @@ PODS:
   - SDWebImageWebPCoder (0.11.0):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.15)
-  - SVGKit (3.1.0):
+  - SVGKit (3.0.0):
     - CocoaLumberjack (~> 3.0)
   - Swifter (1.5.0)
   - SwiftFormat/CLI (0.51.8)
@@ -34,7 +34,7 @@ DEPENDENCIES:
   - SDWebImage
   - SDWebImageSVGKitPlugin
   - SDWebImageWebPCoder
-  - SVGKit (from `https://github.com/SVGKit/SVGKit.git`, branch `3.x`)
+  - SVGKit
   - Swifter (from `https://github.com/httpswift/swifter.git`, branch `stable`)
   - SwiftFormat/CLI
   - SwiftLint
@@ -48,21 +48,16 @@ SPEC REPOS:
     - SDWebImage
     - SDWebImageSVGKitPlugin
     - SDWebImageWebPCoder
+    - SVGKit
     - SwiftFormat
     - SwiftLint
 
 EXTERNAL SOURCES:
-  SVGKit:
-    :branch: 3.x
-    :git: https://github.com/SVGKit/SVGKit.git
   Swifter:
     :branch: stable
     :git: https://github.com/httpswift/swifter.git
 
 CHECKOUT OPTIONS:
-  SVGKit:
-    :commit: 8c290ceee19254f6d0da1940201d5efa31b48f9f
-    :git: https://github.com/SVGKit/SVGKit.git
   Swifter:
     :commit: 1e4f51c92d7ca486242d8bf0722b99de2c3531aa
     :git: https://github.com/httpswift/swifter.git
@@ -75,11 +70,11 @@ SPEC CHECKSUMS:
   SDWebImage: d47d81bea8a77187896b620dc79c3c528e8906b9
   SDWebImageSVGKitPlugin: 7542dd07c344ec3415ded0461a1161a6f087e0c9
   SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499
-  SVGKit: 3c8468aab0026048532a3b27a0c81cdd939f0649
+  SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
   Swifter: aa3514bbb8df8980c118f7bb1b80f2da24e39c2b
   SwiftFormat: 4334264324e20bad415888316165bdc1fc2860bc
   SwiftLint: 1b7561918a19e23bfed960e40759086e70f4dba5
 
-PODFILE CHECKSUM: fb3efc118f488a510c66aae9c8d41f4ee9184af9
+PODFILE CHECKSUM: bbaaa9c3242dd69a1c26c334c2eeb92bbece8f27
 
 COCOAPODS: 1.12.1

Pods/Local Podspecs/SVGKit.podspec.json

@@ -1,63 +0,0 @@
-{
-  "name": "SVGKit",
-  "version": "3.1.0",
-  "license": "MIT",
-  "platforms": {
-    "osx": "10.9",
-    "ios": "5.0",
-    "tvos": "9.0"
-  },
-  "summary": "Display and interact with SVG Images on iOS, using native rendering (CoreAnimation).",
-  "homepage": "https://github.com/SVGKit/SVGKit",
-  "authors": {
-    "Steven Fusco": "github@stevenfusco.com",
-    "adamgit": "adam.m.s.martin@gmail.com",
-    "Kevin Stich": "stich@50cubes.com",
-    "Joshua May": "notjosh@gmail.com",
-    "Eric Man": "meric.au@gmail.com",
-    "Matt Rajca": "matt.rajca@me.com",
-    "Moritz Pfeiffer": "moritz.pfeiffer@alp-phone.ch"
-  },
-  "source": {
-    "git": "https://github.com/SVGKit/SVGKit.git",
-    "tag": "3.1.0"
-  },
-  "source_files": [
-    "Source/*.{h,m}",
-    "Source/**/*.{h,m}"
-  ],
-  "exclude_files": "Source/include/*.h",
-  "private_header_files": "Source/SVGKDefine_Private.h",
-  "ios": {
-    "private_header_files": [
-      "Source/AppKit additions/SVGKImageRep.h",
-      "Source/Exporters/SVGKExporterNSImage.h"
-    ]
-  },
-  "tvos": {
-    "private_header_files": [
-      "Source/AppKit additions/SVGKImageRep.h",
-      "Source/Exporters/SVGKExporterNSImage.h"
-    ]
-  },
-  "osx": {
-    "private_header_files": "Source/Exporters/SVGKExporterUIImage.h"
-  },
-  "libraries": "xml2",
-  "frameworks": [
-    "QuartzCore",
-    "CoreText"
-  ],
-  "dependencies": {
-    "CocoaLumberjack": [
-      "~> 3.0"
-    ]
-  },
-  "module_map": "SVGKitLibrary/SVGKit-iOS/SVGKit.modulemap",
-  "requires_arc": true,
-  "pod_target_xcconfig": {
-    "CLANG_CXX_LANGUAGE_STANDARD": "gnu++11",
-    "CLANG_CXX_LIBRARY": "libc++",
-    "HEADER_SEARCH_PATHS": "$(SDKROOT)/usr/include/libxml2"
-  }
-}

Pods/Manifest.lock

@@ -22,7 +22,7 @@ PODS:
   - SDWebImageWebPCoder (0.11.0):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.15)
-  - SVGKit (3.1.0):
+  - SVGKit (3.0.0):
     - CocoaLumberjack (~> 3.0)
   - Swifter (1.5.0)
   - SwiftFormat/CLI (0.51.8)
@@ -34,7 +34,7 @@ DEPENDENCIES:
   - SDWebImage
   - SDWebImageSVGKitPlugin
   - SDWebImageWebPCoder
-  - SVGKit (from `https://github.com/SVGKit/SVGKit.git`, branch `3.x`)
+  - SVGKit
   - Swifter (from `https://github.com/httpswift/swifter.git`, branch `stable`)
   - SwiftFormat/CLI
   - SwiftLint
@@ -48,21 +48,16 @@ SPEC REPOS:
     - SDWebImage
     - SDWebImageSVGKitPlugin
     - SDWebImageWebPCoder
+    - SVGKit
     - SwiftFormat
     - SwiftLint
 
 EXTERNAL SOURCES:
-  SVGKit:
-    :branch: 3.x
-    :git: https://github.com/SVGKit/SVGKit.git
   Swifter:
     :branch: stable
     :git: https://github.com/httpswift/swifter.git
 
 CHECKOUT OPTIONS:
-  SVGKit:
-    :commit: 8c290ceee19254f6d0da1940201d5efa31b48f9f
-    :git: https://github.com/SVGKit/SVGKit.git
   Swifter:
     :commit: 1e4f51c92d7ca486242d8bf0722b99de2c3531aa
     :git: https://github.com/httpswift/swifter.git
@@ -75,11 +70,11 @@ SPEC CHECKSUMS:
   SDWebImage: d47d81bea8a77187896b620dc79c3c528e8906b9
   SDWebImageSVGKitPlugin: 7542dd07c344ec3415ded0461a1161a6f087e0c9
   SDWebImageWebPCoder: 295a6573c512f54ad2dd58098e64e17dcf008499
-  SVGKit: 3c8468aab0026048532a3b27a0c81cdd939f0649
+  SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
   Swifter: aa3514bbb8df8980c118f7bb1b80f2da24e39c2b
   SwiftFormat: 4334264324e20bad415888316165bdc1fc2860bc
   SwiftLint: 1b7561918a19e23bfed960e40759086e70f4dba5
 
-PODFILE CHECKSUM: fb3efc118f488a510c66aae9c8d41f4ee9184af9
+PODFILE CHECKSUM: bbaaa9c3242dd69a1c26c334c2eeb92bbece8f27
 
 COCOAPODS: 1.12.1

Pods/Pods.xcodeproj/project.pbxproj

@@ -101,6 +101,7 @@
 		1C1B88B591379BAD7D543CD8C71D44A3 /* UIImage+ForceDecode.m in Sources */ = {isa = PBXBuildFile; fileRef = F52B63DFEB4EE48CA6C29293FD75905E /* UIImage+ForceDecode.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		1C5AB731EA1FD1CEF92C0546D17C69E8 /* SVGKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F05AD638DB177A68F628B9407E0D6ED /* SVGKParser.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		1CF7CF35053AD6192002AA179BB4D5FA /* sharpyuv_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = A9561DB6A177F2D1419203F6CB2A47B2 /* sharpyuv_sse2.c */; settings = {COMPILER_FLAGS = "-D_THREAD_SAFE -fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		1D229FFC794F8322B435A5CC1E1C9F14 /* SVGKDefine_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 881509CAE571738656712CCE4C7404D6 /* SVGKDefine_Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1D387B13401CBE3FB0A1B296AB630BFE /* rescaler_neon.c in Sources */ = {isa = PBXBuildFile; fileRef = D2118AB1F3EADE3138DEBC6AD331AAF0 /* rescaler_neon.c */; settings = {COMPILER_FLAGS = "-D_THREAD_SAFE -fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		1D6714F649EC955E7A549EAAB26E0364 /* ProcessingInstruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F1FAF7777991E24FE404CD1418E4364 /* ProcessingInstruction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1DD3AAC2F7641B205C99970F25EA9497 /* SDWeakProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 143AE75B5C886D07397D036B66D88F1C /* SDWeakProxy.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
@@ -159,7 +160,6 @@
 		32C439A4F62DCC196CC09FE882F5F77F /* SVGPolylineElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 5E08519E135D09C6D8FD10CB229B52CC /* SVGPolylineElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		33475F7C2E560B3D671AB5E199FCF7D9 /* SVGKLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6AAD7B48992ED7A91CCF3B2EEE1AC2C2 /* SVGKLayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		337057626A23EBF33D4CC4EC7438FACF /* SVGKSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 995E911876A2984C4977DEDE0CDA9AEA /* SVGKSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		339DD1FC882CCB49EC773FE38F4B8BEE /* SVGKExporterNSImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F8018AB8DF0AC3994E79C2BBA9207649 /* SVGKExporterNSImage.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		34E7735EE27848E95C1CA88AF7A4CD36 /* SVGRectElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F8A78EC764FA0DD9C05423935F1B65D4 /* SVGRectElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		35B596E51ED3EE1FCC3E306AADA3674C /* format_constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 101C05F53CE815EC45C9A6DFD5AD5039 /* format_constants.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		36291754A9DC0AFC367D80FADEE00730 /* SVGGradientElement.h in Headers */ = {isa = PBXBuildFile; fileRef = ADCDB15621D7B2E51D9E0B667B293CD3 /* SVGGradientElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -186,6 +186,7 @@
 		3ED0ACF640186A77F9D9439DAC3303EC /* SDWebImageSVGKitPlugin-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 39A2C69E610427D00D051656E5B1114A /* SDWebImageSVGKitPlugin-dummy.m */; };
 		3F01FAB50DECF8D85F7A54417D327A2E /* near_lossless_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 39A71DB5568EE97B8CFE750F3A88043E /* near_lossless_enc.c */; settings = {COMPILER_FLAGS = "-D_THREAD_SAFE -fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		3F1790581194405582CF85EDFDF76D93 /* dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 98927A8C1FAB03D951FE285F15A89B8E /* dec.c */; settings = {COMPILER_FLAGS = "-D_THREAD_SAFE -fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; };
+		3F6B8639906C2C7E7E9C9EF056384083 /* SVGKImageRep.h in Headers */ = {isa = PBXBuildFile; fileRef = D43C171BA0AB8CDBE71D8D7044967C0F /* SVGKImageRep.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		404B61113AB87679D15F5517FB6DE926 /* SDWebImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 75A5A8B33FF4191155681CE893928221 /* SDWebImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		40560FCEAFAD199C3A321C9F6F0330ED /* SDMemoryCache.h in Headers */ = {isa = PBXBuildFile; fileRef = C88AF2EB2AC3BCC347A2F46D657C6D75 /* SDMemoryCache.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		40A35E49C554912FC85B852136AF18A8 /* NSData+NSInputStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA17C985AFC9D7DE8695C2E30C7801D /* NSData+NSInputStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -365,6 +366,7 @@
 		834E38B38A8BFD8BD755699DDA9E72A0 /* SVGHelperUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B8F6382427946D287B9138D917B2C65 /* SVGHelperUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		835C8FA7AF10ED94162D4BB28009632B /* SDImageAssetManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E7D43E273ACF4670879E1892737989A /* SDImageAssetManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		83C62598717470F75C4C7021C0B31693 /* Node+Mutable.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C15E912BD7D39B8AB97F18AE7092B7 /* Node+Mutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		845619D1F327D9C55012023493131177 /* SVGKExporterNSImage.h in Headers */ = {isa = PBXBuildFile; fileRef = F8018AB8DF0AC3994E79C2BBA9207649 /* SVGKExporterNSImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		84C8FB06D7BF506B3706AAFC15E7A099 /* SVGRadialGradientElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 1556118CE4AED43F15105A577C02BE8B /* SVGRadialGradientElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		852D61E528505C971A6FEC06342E8DD9 /* SVGKPointsAndPathsParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 098D3DC840EB2B40647F279511AE04F0 /* SVGKPointsAndPathsParser.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		85435F4035E16E4B6E7BEC082506FA55 /* SDImageCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E915A34E0E1AB64987FC64ED05DFDE9 /* SDImageCoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -503,7 +505,6 @@
 		BC6B9A255FBE7D2CE73AF3E905744999 /* picture_psnr_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = A03EECB864AE4AD80613CD4A404C590D /* picture_psnr_enc.c */; settings = {COMPILER_FLAGS = "-D_THREAD_SAFE -fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		BC773AA342E15112FC9C036D02C260CE /* DDASLLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 76F4BBBCFC2C6CD4701E9AF42374F17A /* DDASLLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BC927A57E6D341A611B5E875867C3C7C /* demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 49869391B262D7BF850FD83E91478C97 /* demux.c */; settings = {COMPILER_FLAGS = "-D_THREAD_SAFE -fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		BCE98D93D81536B12210B08ACD05A67E /* SVGKImageRep.h in Headers */ = {isa = PBXBuildFile; fileRef = D43C171BA0AB8CDBE71D8D7044967C0F /* SVGKImageRep.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		BD2FB1E5B56DD0337E939EFC706CC02D /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A34BCA8D7623DFAC9E6D624598A9F58 /* UIImage+WebP.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		BDEC1D3B173C6F7BEC67565EF19F3452 /* vp8i_dec.h in Headers */ = {isa = PBXBuildFile; fileRef = 780E11D49E764DF69F65447FD69A34B4 /* vp8i_dec.h */; settings = {ATTRIBUTES = (Project, ); }; };
 		BE2C665DF3B22F5FC6AA14386953EB98 /* CAShapeLayerWithHitTest.h in Headers */ = {isa = PBXBuildFile; fileRef = FF995DC1D1FD6D6B1593F5FF46BEB14B /* CAShapeLayerWithHitTest.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -545,7 +546,6 @@
 		CD366C92F7016984269D0821F073C34B /* SDImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 916346B0423B51A7E6A585E994A91C8D /* SDImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CD56CDA5F0E25249D7E98F3467899B5F /* Pods-DcShare-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 915BCA32D4216B4489565D94B65E5BD9 /* Pods-DcShare-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CD58569DBC17B76B9F25DD5DE4477B93 /* SVGStyleElement.h in Headers */ = {isa = PBXBuildFile; fileRef = E0E185E520B419D34BF6A3B177DA4714 /* SVGStyleElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CDC184F822907BA36B165FA1CE4AAF73 /* SVGKDefine_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 881509CAE571738656712CCE4C7404D6 /* SVGKDefine_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		CE63112A86470A84D06C84C80B45EADE /* Node.h in Headers */ = {isa = PBXBuildFile; fileRef = DFB2AA85BBD831C0CA9354EF973DB8B7 /* Node.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CE88C6E422F6ED3A1857DED015C383B4 /* SVGKLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 210EC7DB9C4F6F03C6B9FFBE67E14770 /* SVGKLayer.m */; settings = {COMPILER_FLAGS = "-DOS_OBJECT_USE_OBJC=0 -w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		CEA2F0CCAFD83C8D40EC89D4B961C65D /* filter_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = B105234D5C44B69496EB3496FBFA9C19 /* filter_enc.c */; settings = {COMPILER_FLAGS = "-D_THREAD_SAFE -fno-objc-arc -w -Xanalyzer -analyzer-disable-all-checks"; }; };
@@ -3050,14 +3050,14 @@
 				834E38B38A8BFD8BD755699DDA9E72A0 /* SVGHelperUtilities.h in Headers */,
 				F224248917964EB63933714C7B0FCE85 /* SVGImageElement.h in Headers */,
 				28C7EBC311566AFA0D89FCC364EB0969 /* SVGKDefine.h in Headers */,
-				CDC184F822907BA36B165FA1CE4AAF73 /* SVGKDefine_Private.h in Headers */,
+				1D229FFC794F8322B435A5CC1E1C9F14 /* SVGKDefine_Private.h in Headers */,
 				77881C3CC3BB82FDC079617215A8483C /* SVGKExporterNSData.h in Headers */,
-				339DD1FC882CCB49EC773FE38F4B8BEE /* SVGKExporterNSImage.h in Headers */,
+				845619D1F327D9C55012023493131177 /* SVGKExporterNSImage.h in Headers */,
 				E3A3BE457254D586B3B8BDFF350C7AE3 /* SVGKExporterUIImage.h in Headers */,
 				8313DFAEBD0095146411C2538D59478D /* SVGKFastImageView.h in Headers */,
 				9BD60F577F6C53F26E6F7945E91A95CB /* SVGKImage.h in Headers */,
 				26B87A22CC40893B710ACBFF0F1AB2C0 /* SVGKImage+CGContext.h in Headers */,
-				BCE98D93D81536B12210B08ACD05A67E /* SVGKImageRep.h in Headers */,
+				3F6B8639906C2C7E7E9C9EF056384083 /* SVGKImageRep.h in Headers */,
 				FC4C696FF594EC8538D861901AF5E12C /* SVGKImageView.h in Headers */,
 				218B1CA14FD1739AC15A7CA7A3BEBD15 /* SVGKInlineResource.h in Headers */,
 				178DB6E7A97D2A2AE49402836EBC7217 /* SVGKit.h in Headers */,
@@ -4770,7 +4770,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -5080,7 +5080,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Pods/SVGKit/README.mdown

@@ -25,7 +25,6 @@ You have 3 main options for installing SVGKit:
 1. Use CocoaPods
 1. Use Carthage
 1. Drag/drop the static library into your project, and configure the build settings in your project
-1. Use Swift Package Manager
 
 NB: the "static library" is our backwards-compatible, manual install that always works if you have problems with CocoaPods/Carthage/Framework.
 
@@ -101,11 +100,6 @@ It's all setup already, all you need to do is:
 
 Everything else is automatic.
 
-## OPTION 5: Using Swift Package Manager
-
-In XCode go to `File` -> `Add Packages...` and provide URL to this repository in the search bar. Choose `Dependency Role` and select apropriate project. 
-
-
 ## Usage - OS X
 
 Added in version 2.1.0 / Autumn 2018: support for macOS.

Pods/SVGKit/SVGKitLibrary/SVGKit-iOS/SVGKit.modulemap

@@ -1,10 +1,6 @@
 framework module SVGKit {
   umbrella header "SVGKit.h"
 
-  exclude header "SVGKDefine_Private.h"
-  exclude header "SVGKExporterNSImage.h"
-  exclude header "SVGKImageRep.h"
-
   export *
   module * { export * }
 }

Pods/SVGKit/Source/DOM classes/SVG-DOM/SVGLength.m

@@ -229,7 +229,7 @@ static float cachedDevicePixelsPerInch;
         return 326.0f;
     }
 	
-	if( [platform hasPrefix:@"x86_64"] || [platform hasPrefix:@"arm64"])
+	if( [platform hasPrefix:@"x86_64"])
 	{
 		SVGKitLogWarn(@"[%@] WARNING: you are running on the simulator; it's impossible for us to calculate centimeter/millimeter/inches units correctly", [self class]);
 		return 132.0f; // Simulator, running on desktop machine

Pods/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGImageElement.m

@@ -80,19 +80,7 @@ CGImageRef SVGImageCGImage(UIImage *img)
 													options:NSRegularExpressionSearch
 													  range:NSMakeRange(0, [_href length]) ];
 		
-		// use the format defined at: https://www.rfc-editor.org/rfc/rfc2397
-		NSRange base64Range = [_href rangeOfString: @";base64,"];
-		if (base64Range.location != NSNotFound)
-		{
-			// initialize image data directly from the base64 string if the herf is an inline image encoded as base64.
-			// This will fix the warnings shown console:
-			// nil host used in call to allowsSpecificHTTPSCertificateForHost
-			// nil host used in call to allowsAnyHTTPSCertificateForHost
-			imageData = [[NSData alloc] initWithBase64EncodedString: [_href substringFromIndex:base64Range.location + base64Range.length] options:0];
-		} else
-		{
-			imageData = [NSData dataWithContentsOfURL:[NSURL URLWithString:_href]];
-		}
+		imageData = [NSData dataWithContentsOfURL:[NSURL URLWithString:_href]];
 	}
 	else
 	{

Pods/SVGKit/Source/ImageViews/SVGKFastImageView.m

@@ -226,7 +226,6 @@
 	
 	CGSize scaleConvertImageToView;
 	CGSize tileSize;
-  CGSize translateSize;
 	if( cols == 1 && rows == 1 ) // if we are NOT tiling, then obey the UIViewContentMode as best we can!
 	{
 #ifdef USE_SUBLAYERS_INSTEAD_OF_BLIT
@@ -240,51 +239,16 @@
 			[self.layer addSublayer:self.image.CALayerTree];
 			return; // we've added the layer - let Apple take care of the rest!
 		}
-#elif SVGKIT_MAC
-        scaleConvertImageToView = CGSizeMake( self.bounds.size.width / imageBounds.size.width, self.bounds.size.height / imageBounds.size.height );
-        translateSize = self.bounds.size;
 #else
-    switch (self.contentMode) {
-      case UIViewContentModeScaleAspectFit:{
-        CGFloat nativeAspectRatio = imageBounds.size.width / imageBounds.size.height;
-        CGFloat boundedAspectRatio = self.bounds.size.width / self.bounds.size.height;
-        if (nativeAspectRatio >= boundedAspectRatio) {
-          scaleConvertImageToView = CGSizeMake( self.bounds.size.width / imageBounds.size.width, self.bounds.size.width *  nativeAspectRatio / imageBounds.size.height );
-          translateSize = CGSizeMake(0, (self.bounds.size.height - self.bounds.size.width)/2.0f);
- } else {
-          scaleConvertImageToView = CGSizeMake( self.bounds.size.height *  nativeAspectRatio / imageBounds.size.width, self.bounds.size.height / imageBounds.size.height );
-   translateSize = CGSizeMake((self.bounds.size.width - self.bounds.size.height)/2.0f, 0);
-        }
-        break;
-      }
-      case UIViewContentModeScaleAspectFill:{
-        CGFloat nativeAspectRatio = imageBounds.size.width / imageBounds.size.height;
-        CGFloat boundedAspectRatio = self.bounds.size.width / self.bounds.size.height;
-        if (nativeAspectRatio >= boundedAspectRatio) {
-          scaleConvertImageToView = CGSizeMake( self.bounds.size.height *  nativeAspectRatio / imageBounds.size.width, self.bounds.size.height / imageBounds.size.height );
-   translateSize = CGSizeMake((self.bounds.size.width - self.bounds.size.height)/2.0f, 0);
- } else {
-   scaleConvertImageToView = CGSizeMake( self.bounds.size.width / imageBounds.size.width, self.bounds.size.width *  nativeAspectRatio / imageBounds.size.height );
-   translateSize = CGSizeMake(0, (self.bounds.size.height - self.bounds.size.width)/2.0f);
-          
-        }
-        break;
-      }
-      default: {
-        scaleConvertImageToView = CGSizeMake( self.bounds.size.width / imageBounds.size.width, self.bounds.size.height / imageBounds.size.height );
-        translateSize = CGSizeZero;
-        break;
-      }
-        
-  }
+		scaleConvertImageToView = CGSizeMake( self.bounds.size.width / imageBounds.size.width, self.bounds.size.height / imageBounds.size.height );
+		tileSize = self.bounds.size;
 #endif
 	}
 	else
 	{
 		scaleConvertImageToView = CGSizeMake( self.bounds.size.width / (self.tileRatio.width * imageBounds.size.width), self.bounds.size.height / ( self.tileRatio.height * imageBounds.size.height) );
 		tileSize = CGSizeMake( self.bounds.size.width / self.tileRatio.width, self.bounds.size.height / self.tileRatio.height );
-    translateSize = CGSizeZero;
-}
+	}
 	
 	//DEBUG: SVGKitLogVerbose(@"cols, rows: %i, %i ... scaleConvert: %@ ... tilesize: %@", cols, rows, NSStringFromCGSize(scaleConvertImageToView), NSStringFromCGSize(tileSize) );
 	/** To support tiling, and to allow internal shrinking, we use renderInContext */
@@ -299,8 +263,7 @@
 			CGContextSaveGState(context);
 			
 			CGContextTranslateCTM(context, i * tileSize.width, k * tileSize.height );
-      CGContextTranslateCTM(context, translateSize.width, translateSize.height );
-      CGContextScaleCTM( context, scaleConvertImageToView.width, scaleConvertImageToView.height );
+			CGContextScaleCTM( context, scaleConvertImageToView.width, scaleConvertImageToView.height );
 			
             [self.image renderInContext:context];
 			

Pods/SVGKit/Source/Parsers/SVGKPointsAndPathsParser.m

@@ -314,23 +314,6 @@ static inline CGPoint SVGCurveReflectedControlPoint(SVGCurve prevCurve)
     return p;
 }
 
-/**
- flag  (An elliptical arc argument may present 2 flags as 00)
- ("0"|"1")
- */
-
-+ (BOOL) readFlag:(NSScanner*)scanner
-{
-    if ([scanner scanString:@"0" intoString:NULL]) {
-        return FALSE;
-    }
-    if ([scanner scanString:@"1" intoString:NULL]) {
-        return TRUE;
-    }
-    NSAssert(FALSE, @"invalid flag value");
-    return FALSE;
-}
-
 + (void) readCoordinate:(NSScanner*)scanner intoFloat:(CGFloat*) floatPointer
 {
 #if CGFLOAT_IS_DOUBLE
@@ -848,12 +831,11 @@ static inline CGPoint SVGCurveReflectedControlPoint(SVGCurve prevCurve)
 	phi = fmod(phi, 2 * M_PI);
     
     [SVGKPointsAndPathsParser readCommaAndWhitespace:scanner];
-
-    BOOL largeArcFlag = [SVGKPointsAndPathsParser readFlag:scanner];
-
-    [SVGKPointsAndPathsParser readCommaAndWhitespace:scanner];
-
-    BOOL sweepFlag = [SVGKPointsAndPathsParser readFlag:scanner];
+	
+	CGPoint flags = [SVGKPointsAndPathsParser readCoordinatePair:scanner];
+	
+	BOOL largeArcFlag = flags.x != 0.;
+	BOOL sweepFlag = flags.y != 0.;
     
     [SVGKPointsAndPathsParser readCommaAndWhitespace:scanner];
     

Pods/SVGKit/Source/Utils/SVGUtils.h

@@ -21,7 +21,6 @@ typedef struct {
 SVGColor SVGColorMake (uint8_t r, uint8_t g, uint8_t b, uint8_t a);
 SVGColor SVGColorFromString (const char *string);
 
-CGFloat SVGHSLColorToRGB (CGFloat p, CGFloat q, CGFloat t);
 CGFloat SVGPercentageFromString (const char *string);
 
 CGMutablePathRef createPathFromPointsInString (const char *string, boolean_t close);

Pods/SVGKit/Source/Utils/SVGUtils.m

@@ -270,9 +270,7 @@ SVGColor SVGColorMake (uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
 typedef enum {
 	PhaseNone = 0,
 	PhaseRGB,
-    PhaseRGBA,
-    PhaseHSL,
-    PhaseHSLA
+    PhaseRGBA
 } Phase;
 
 SVGColor SVGColorFromString (const char *string) {
@@ -340,82 +338,6 @@ SVGColor SVGColorFromString (const char *string) {
 			accum[accumIdx++] = c;
 		}
 	}
-    else if (!strncmp(string, "hsl(", 4) || !strncmp(string, "hsla(", 5)) {
-        CGFloat h; CGFloat s; CGFloat l;
-        
-        size_t len = strlen(string);
-        
-        char accum[MAX_ACCUM];
-        bzero(accum, MAX_ACCUM);
-        
-        int accumIdx = 0, currComponent = 0;
-        Phase phase = PhaseNone;
-        
-        for (size_t n = 0; n < len; n++) {
-            char c = string[n];
-            
-            if (c == '\n' || c == '\t' || c == ' ') {
-                continue;
-            }
-            
-            if (!strcmp(accum, "hsla(")) {
-                phase = PhaseHSLA;
-                bzero(accum, MAX_ACCUM);
-                accumIdx = 0;
-            } else if (!strcmp(accum, "hsl(")) {
-                phase = PhaseHSL;
-                bzero(accum, MAX_ACCUM);
-                accumIdx = 0;
-            }
-            
-            if (phase == PhaseHSL || phase == PhaseHSLA) {
-                if (c == ',') {
-                    if (currComponent == 0) {
-                        h = atof(accum) / 360.0f;
-                        currComponent++;
-                    }
-                    else if (currComponent == 1) {
-                        s = SVGPercentageFromString(accum);
-                        currComponent++;
-                    }
-                    else if (phase == PhaseHSLA && currComponent == 2) {
-                        l = SVGPercentageFromString(accum);
-                        currComponent++;
-                    }
-                    bzero(accum, MAX_ACCUM);
-                    accumIdx = 0;
-                    
-                    continue;
-                }
-                else if (c == ')' && currComponent == 2) {
-                    l = SVGPercentageFromString(accum);
-                    break;
-                }
-                else if (c == ')' && currComponent == 3) {
-                    if (atof(accum) > 1.0f) {
-                        color.a = 255.0f;
-                    } else {
-                        color.a = (uint8_t)lround(atof(accum) * 255.0f);
-                    }
-                    break;
-                }
-            }
-            
-            accum[accumIdx++] = c;
-        }
-        
-        // hsla to rbg
-        if(s == 0.0f){
-            color.r = color.g = color.b = l; // achromatic
-        }else{
-            CGFloat q; CGFloat p;
-            q = l < 0.5f ? l * (1.0f + s) : l + s - l * s;
-            p = 2.0f * l - q;
-            color.r = (uint8_t)lround(SVGHSLColorToRGB(p, q, h + 0.33f) * 255.0f);
-            color.g = (uint8_t)lround(SVGHSLColorToRGB(p, q, h) * 255.0f);
-            color.b = (uint8_t)lround(SVGHSLColorToRGB(p, q, h - 0.33f) * 255.0f);
-        }
-    }
 	else if (!strncmp(string, "#", 1)) {
 		const char *hexString = string + 1;
 		
@@ -463,15 +385,6 @@ SVGColor SVGColorFromString (const char *string) {
 	return color;
 }
 
-CGFloat SVGHSLColorToRGB (CGFloat p, CGFloat q, CGFloat t) {
-    if(t < 0.0f) t += 1.0f;
-    if(t > 1.0f) t -= 1.0f;
-    if(t < 0.166f) return p + (q - p) * 6.0f * t;
-    if(t < 0.5f) return q;
-    if(t < 0.66f) return p + (q - p) * (0.66f - t) * 6.0f;
-    return p;
-}
-
 CGFloat SVGPercentageFromString (const char *string) {
 	size_t len = strlen(string);
 	

Pods/Target Support Files/SVGKit/SVGKit-Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>3.1.0</string>
+  <string>3.0.0</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>

Pods/Target Support Files/SVGKit/SVGKit.modulemap

@@ -1,10 +1,6 @@
 framework module SVGKit {
   umbrella header "SVGKit.h"
 
-  exclude header "SVGKDefine_Private.h"
-  exclude header "SVGKExporterNSImage.h"
-  exclude header "SVGKImageRep.h"
-
   export *
   module * { export * }
 }

deltachat-ios.xcodeproj/project.pbxproj

@@ -7,8 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0B0A5C05F49E30F57B6F73C5 /* Pods_DcShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 456267D3A3AE57C533877C2B /* Pods_DcShare.framework */; };
 		21D54500299415B9008B54D5 /* Character+Extentions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D544FF299415B9008B54D5 /* Character+Extentions.swift */; };
 		21D6C941260623F500D0755A /* NotificationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21D6C9392606190600D0755A /* NotificationManager.swift */; };
+		29AAA03053C393EAEF537AFE /* Pods_deltachat_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88C8BBF4611AA3963E496219 /* Pods_deltachat_ios.framework */; };
 		3008CB7224F93EB900E6A617 /* AudioMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7124F93EB900E6A617 /* AudioMessageCell.swift */; };
 		3008CB7424F9436C00E6A617 /* AudioPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7324F9436C00E6A617 /* AudioPlayerView.swift */; };
 		3008CB7624F95B6D00E6A617 /* AudioController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008CB7524F95B6D00E6A617 /* AudioController.swift */; };
@@ -145,6 +147,7 @@
 		78ED838321D5379000243125 /* TextFieldCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78ED838221D5379000243125 /* TextFieldCell.swift */; };
 		78ED839421D5AF8A00243125 /* QrCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78ED839321D5AF8A00243125 /* QrCodeView.swift */; };
 		7A0052C81FBE6CB40048C3BF /* NewContactController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A0052C71FBE6CB40048C3BF /* NewContactController.swift */; };
+		7A0A04B522ACBAF93B0A27E7 /* Pods_deltachat_iosTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 53B2210FF5A043EA0A115368 /* Pods_deltachat_iosTests.framework */; };
 		7A451DB01FB1F84900177250 /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A451DAF1FB1F84900177250 /* AppCoordinator.swift */; };
 		7A9FB1441FB061E2001FEA36 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A9FB1431FB061E2001FEA36 /* AppDelegate.swift */; };
 		7A9FB14B1FB061E2001FEA36 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7A9FB14A1FB061E2001FEA36 /* Assets.xcassets */; };
@@ -206,9 +209,6 @@
 		B2C42570265C325C00B95377 /* MultilineLabelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2C4256F265C325C00B95377 /* MultilineLabelCell.swift */; };
 		B2D4B63B29C38D1900B47DA8 /* ChatsAndMediaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2D4B63A29C38D1900B47DA8 /* ChatsAndMediaViewController.swift */; };
 		B2F899E129F96A67003797D5 /* AllMediaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2F899E029F96A67003797D5 /* AllMediaViewController.swift */; };
-		C5BB4491ED6CDE1263FF6A90 /* Pods_DcShare.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 666D45FB4203AA5CA69932C0 /* Pods_DcShare.framework */; };
-		E24854B27C7DE0C9454B58C8 /* Pods_deltachat_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33ECEE1424AB54864B33D8D7 /* Pods_deltachat_ios.framework */; };
-		F4FF2FB6FB2E0009D0F6611E /* Pods_deltachat_iosTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C297393895BBC1A8022111EA /* Pods_deltachat_iosTests.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -254,9 +254,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0EA7C97589B2BBEF0CE51580 /* Pods-DcShare.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DcShare.release.xcconfig"; path = "Target Support Files/Pods-DcShare/Pods-DcShare.release.xcconfig"; sourceTree = "<group>"; };
 		21D544FF299415B9008B54D5 /* Character+Extentions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Character+Extentions.swift"; sourceTree = "<group>"; };
 		21D6C9392606190600D0755A /* NotificationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationManager.swift; sourceTree = "<group>"; };
+		2B36A26574DBF55EEACD7877 /* Pods-deltachat-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.release.xcconfig"; path = "Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig"; sourceTree = "<group>"; };
 		3008CB7124F93EB900E6A617 /* AudioMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioMessageCell.swift; sourceTree = "<group>"; };
 		3008CB7324F9436C00E6A617 /* AudioPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayerView.swift; sourceTree = "<group>"; };
 		3008CB7524F95B6D00E6A617 /* AudioController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioController.swift; sourceTree = "<group>"; };
@@ -419,10 +419,11 @@
 		30FDB6F824D1C1000066C48D /* ChatViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
 		30FDB71E24D8170E0066C48D /* TextMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextMessageCell.swift; sourceTree = "<group>"; };
 		30FDB72024D838240066C48D /* BaseMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseMessageCell.swift; sourceTree = "<group>"; };
-		33ECEE1424AB54864B33D8D7 /* Pods_deltachat_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		5F83FD2F5A5624AE4B5DB03E /* Pods-deltachat-iosTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-iosTests.debug.xcconfig"; path = "Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.debug.xcconfig"; sourceTree = "<group>"; };
-		666D45FB4203AA5CA69932C0 /* Pods_DcShare.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DcShare.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		69816DF046E14DEB88695454 /* Pods-deltachat-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.release.xcconfig"; path = "Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.release.xcconfig"; sourceTree = "<group>"; };
+		367D402BEFCE9A6E4FDC5256 /* Pods-DcShare.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DcShare.debug.xcconfig"; path = "Target Support Files/Pods-DcShare/Pods-DcShare.debug.xcconfig"; sourceTree = "<group>"; };
+		3733C8B80B9236DBF6253372 /* Pods-deltachat-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.debug.xcconfig"; path = "Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.debug.xcconfig"; sourceTree = "<group>"; };
+		456267D3A3AE57C533877C2B /* Pods_DcShare.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DcShare.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		45FFE772E2F94FBE4E64F362 /* Pods-deltachat-iosTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-iosTests.debug.xcconfig"; path = "Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.debug.xcconfig"; sourceTree = "<group>"; };
+		53B2210FF5A043EA0A115368 /* Pods_deltachat_iosTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_iosTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7070FB9A2101ECBB000DC258 /* NewGroupController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewGroupController.swift; sourceTree = "<group>"; };
 		7092474020B3869500AF8799 /* ContactDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactDetailViewController.swift; sourceTree = "<group>"; };
 		70B8882D2091B8550074812E /* ContactCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactCell.swift; sourceTree = "<group>"; };
@@ -436,7 +437,6 @@
 		78ED838221D5379000243125 /* TextFieldCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldCell.swift; sourceTree = "<group>"; };
 		78ED839321D5AF8A00243125 /* QrCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QrCodeView.swift; sourceTree = "<group>"; };
 		7A0052C71FBE6CB40048C3BF /* NewContactController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewContactController.swift; sourceTree = "<group>"; };
-		7A18F9878D3990857414EB1C /* Pods-deltachat-iosTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-iosTests.release.xcconfig"; path = "Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.release.xcconfig"; sourceTree = "<group>"; };
 		7A451DAF1FB1F84900177250 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
 		7A9FB1401FB061E2001FEA36 /* deltachat-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "deltachat-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7A9FB1431FB061E2001FEA36 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -444,7 +444,7 @@
 		7A9FB14D1FB061E2001FEA36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		7A9FB14F1FB061E2001FEA36 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7AE0A5481FC42F65005ECB4B /* NewChatViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewChatViewController.swift; sourceTree = "<group>"; };
-		8C6B6FDA1D0D5659F1BB48C8 /* Pods-DcShare.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DcShare.debug.xcconfig"; path = "Target Support Files/Pods-DcShare/Pods-DcShare.debug.xcconfig"; sourceTree = "<group>"; };
+		88C8BBF4611AA3963E496219 /* Pods_deltachat_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AE0AA951247800E700D42A7F /* GalleryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryCell.swift; sourceTree = "<group>"; };
 		AE0AA9552478191900D42A7F /* GridCollectionViewFlowLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GridCollectionViewFlowLayout.swift; sourceTree = "<group>"; };
 		AE0AA957247834A400D42A7F /* Date+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extension.swift"; sourceTree = "<group>"; };
@@ -575,8 +575,8 @@
 		B2D729EA27C57B9000A4E0BE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		B2D729EB27C57B9000A4E0BE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		B2F899E029F96A67003797D5 /* AllMediaViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AllMediaViewController.swift; sourceTree = "<group>"; };
-		C297393895BBC1A8022111EA /* Pods_deltachat_iosTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_deltachat_iosTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		CE1F8523D8EE6CEC6DA717F1 /* Pods-deltachat-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-ios.debug.xcconfig"; path = "Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios.debug.xcconfig"; sourceTree = "<group>"; };
+		B3ABD4C361673EE2C4E0DD66 /* Pods-deltachat-iosTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-deltachat-iosTests.release.xcconfig"; path = "Target Support Files/Pods-deltachat-iosTests/Pods-deltachat-iosTests.release.xcconfig"; sourceTree = "<group>"; };
+		BD321F20BEE5052C1223348D /* Pods-DcShare.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DcShare.release.xcconfig"; path = "Target Support Files/Pods-DcShare/Pods-DcShare.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -585,7 +585,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				30E8F2252447622300CE2C90 /* DcCore.framework in Frameworks */,
-				C5BB4491ED6CDE1263FF6A90 /* Pods_DcShare.framework in Frameworks */,
+				0B0A5C05F49E30F57B6F73C5 /* Pods_DcShare.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -593,7 +593,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E24854B27C7DE0C9454B58C8 /* Pods_deltachat_ios.framework in Frameworks */,
+				29AAA03053C393EAEF537AFE /* Pods_deltachat_ios.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -601,27 +601,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F4FF2FB6FB2E0009D0F6611E /* Pods_deltachat_iosTests.framework in Frameworks */,
+				7A0A04B522ACBAF93B0A27E7 /* Pods_deltachat_iosTests.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		06C66AF48247E0E6BAA92835 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				8C6B6FDA1D0D5659F1BB48C8 /* Pods-DcShare.debug.xcconfig */,
-				0EA7C97589B2BBEF0CE51580 /* Pods-DcShare.release.xcconfig */,
-				CE1F8523D8EE6CEC6DA717F1 /* Pods-deltachat-ios.debug.xcconfig */,
-				69816DF046E14DEB88695454 /* Pods-deltachat-ios.release.xcconfig */,
-				5F83FD2F5A5624AE4B5DB03E /* Pods-deltachat-iosTests.debug.xcconfig */,
-				7A18F9878D3990857414EB1C /* Pods-deltachat-iosTests.release.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		304219D7244072E600516852 /* DC */ = {
 			isa = PBXGroup;
 			children = (
@@ -829,7 +815,7 @@
 				30E8F2112447285600CE2C90 /* DcShare */,
 				7A9FB1411FB061E2001FEA36 /* Products */,
 				7A9FB4F81FB084E6001FEA36 /* Frameworks */,
-				06C66AF48247E0E6BAA92835 /* Pods */,
+				AFE4D4B4B038293E63BC1537 /* Pods */,
 			);
 			indentWidth = 4;
 			sourceTree = "<group>";
@@ -883,9 +869,9 @@
 			children = (
 				304219D1243F588500516852 /* DcCore.framework */,
 				787D6699229F2237000A7A9D /* libdeltachat.a */,
-				666D45FB4203AA5CA69932C0 /* Pods_DcShare.framework */,
-				33ECEE1424AB54864B33D8D7 /* Pods_deltachat_ios.framework */,
-				C297393895BBC1A8022111EA /* Pods_deltachat_iosTests.framework */,
+				456267D3A3AE57C533877C2B /* Pods_DcShare.framework */,
+				88C8BBF4611AA3963E496219 /* Pods_deltachat_ios.framework */,
+				53B2210FF5A043EA0A115368 /* Pods_deltachat_iosTests.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -1060,6 +1046,19 @@
 			path = Handler;
 			sourceTree = "<group>";
 		};
+		AFE4D4B4B038293E63BC1537 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				367D402BEFCE9A6E4FDC5256 /* Pods-DcShare.debug.xcconfig */,
+				BD321F20BEE5052C1223348D /* Pods-DcShare.release.xcconfig */,
+				3733C8B80B9236DBF6253372 /* Pods-deltachat-ios.debug.xcconfig */,
+				2B36A26574DBF55EEACD7877 /* Pods-deltachat-ios.release.xcconfig */,
+				45FFE772E2F94FBE4E64F362 /* Pods-deltachat-iosTests.debug.xcconfig */,
+				B3ABD4C361673EE2C4E0DD66 /* Pods-deltachat-iosTests.release.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		B28D25882913CE8600B9067F /* Settings */ = {
 			isa = PBXGroup;
 			children = (
@@ -1086,7 +1085,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 30E8F21E2447285600CE2C90 /* Build configuration list for PBXNativeTarget "DcShare" */;
 			buildPhases = (
-				76BF5A629EC3D7353F56FFDC /* [CP] Check Pods Manifest.lock */,
+				C78C65B4F0617F16E9DD21E8 /* [CP] Check Pods Manifest.lock */,
 				30E8F20C2447285600CE2C90 /* Sources */,
 				30E8F20D2447285600CE2C90 /* Frameworks */,
 				30E8F20E2447285600CE2C90 /* Resources */,
@@ -1104,7 +1103,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 7A9FB1521FB061E2001FEA36 /* Build configuration list for PBXNativeTarget "deltachat-ios" */;
 			buildPhases = (
-				97A180D68E482630D20F2955 /* [CP] Check Pods Manifest.lock */,
+				E7D09C716DD65CF630609D86 /* [CP] Check Pods Manifest.lock */,
 				7A9FB13C1FB061E2001FEA36 /* Sources */,
 				7A9FB13D1FB061E2001FEA36 /* Frameworks */,
 				7A9FB13E1FB061E2001FEA36 /* Resources */,
@@ -1112,7 +1111,7 @@
 				7837B64621E5532B00CDE126 /* ShellScript */,
 				304219D4243F588600516852 /* Embed Frameworks */,
 				30E8F21B2447285600CE2C90 /* Embed Foundation Extensions */,
-				D1FCC899E51FFDEE5882A5A5 /* [CP] Embed Pods Frameworks */,
+				D9A39B5FE63A010E11829D38 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -1128,7 +1127,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = AE851A08227AECDF00ED86F0 /* Build configuration list for PBXNativeTarget "deltachat-iosTests" */;
 			buildPhases = (
-				1C6B206C32BF1A9F76DF8E8B /* [CP] Check Pods Manifest.lock */,
+				E915E3F713CED45AB76300DA /* [CP] Check Pods Manifest.lock */,
 				AE8519FD227AECDE00ED86F0 /* Sources */,
 				AE8519FE227AECDE00ED86F0 /* Frameworks */,
 				AE8519FF227AECDE00ED86F0 /* Resources */,
@@ -1284,7 +1283,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1C6B206C32BF1A9F76DF8E8B /* [CP] Check Pods Manifest.lock */ = {
+		7837B63821E54CB400CDE126 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1292,21 +1291,17 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "Run Script";
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-deltachat-iosTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\"\n";
 		};
-		76BF5A629EC3D7353F56FFDC /* [CP] Check Pods Manifest.lock */ = {
+		7837B64621E5532B00CDE126 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1314,21 +1309,16 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-DcShare-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
+			shellScript = "\"${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat\"\n";
 		};
-		7837B63821E54CB400CDE126 /* Run Script */ = {
+		C78C65B4F0617F16E9DD21E8 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1336,34 +1326,53 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
-			name = "Run Script";
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
 			);
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-DcShare-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
 		};
-		7837B64621E5532B00CDE126 /* ShellScript */ = {
+		D9A39B5FE63A010E11829D38 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
+				"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
+				"${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImageSVGKitPlugin/SDWebImageSVGKitPlugin.framework",
+				"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
+				"${BUILT_PRODUCTS_DIR}/SVGKit/SVGKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Swifter/Swifter.framework"
 			);
-			outputFileListPaths = (
-			);
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SCSiriWaveformView.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageSVGKitPlugin.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVGKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Swifter.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
-		97A180D68E482630D20F2955 /* [CP] Check Pods Manifest.lock */ = {
+		E7D09C716DD65CF630609D86 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1385,38 +1394,26 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D1FCC899E51FFDEE5882A5A5 /* [CP] Embed Pods Frameworks */ = {
+		E915E3F713CED45AB76300DA /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
-				"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
-				"${BUILT_PRODUCTS_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework",
-				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
-				"${BUILT_PRODUCTS_DIR}/SDWebImageSVGKitPlugin/SDWebImageSVGKitPlugin.framework",
-				"${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
-				"${BUILT_PRODUCTS_DIR}/SVGKit/SVGKit.framework",
-				"${BUILT_PRODUCTS_DIR}/Swifter/Swifter.framework",
-				"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SCSiriWaveformView.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageSVGKitPlugin.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SVGKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Swifter.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
+				"$(DERIVED_FILE_DIR)/Pods-deltachat-iosTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-deltachat-ios/Pods-deltachat-ios-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -1817,7 +1814,7 @@
 /* Begin XCBuildConfiguration section */
 		30E8F21C2447285600CE2C90 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8C6B6FDA1D0D5659F1BB48C8 /* Pods-DcShare.debug.xcconfig */;
+			baseConfigurationReference = 367D402BEFCE9A6E4FDC5256 /* Pods-DcShare.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = DcShare/DcShare.entitlements;
@@ -1826,6 +1823,11 @@
 				CURRENT_PROJECT_VERSION = 88;
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"",
+				);
 				INFOPLIST_FILE = DcShare/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1836,17 +1838,29 @@
 				MARKETING_VERSION = 1.36.4;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					"-isystem",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers\"",
+					"-isystem",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework/Headers\"",
+					"-iframework",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
+					"-iframework",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcShare;
 				PRODUCT_NAME = "Delta Chat";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
 		};
 		30E8F21D2447285600CE2C90 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0EA7C97589B2BBEF0CE51580 /* Pods-DcShare.release.xcconfig */;
+			baseConfigurationReference = BD321F20BEE5052C1223348D /* Pods-DcShare.release.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_ENTITLEMENTS = DcShare/DcShare.entitlements;
@@ -1855,6 +1869,11 @@
 				CURRENT_PROJECT_VERSION = 88;
 				DEVELOPMENT_TEAM = 8Y86453UA8;
 				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"",
+				);
 				INFOPLIST_FILE = DcShare/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1864,11 +1883,23 @@
 				);
 				MARKETING_VERSION = 1.36.4;
 				MTL_FAST_MATH = YES;
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					"-isystem",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers\"",
+					"-isystem",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework/Headers\"",
+					"-iframework",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
+					"-iframework",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcShare;
 				PRODUCT_NAME = "Delta Chat";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;
 		};
@@ -1992,7 +2023,7 @@
 		};
 		7A9FB1531FB061E2001FEA36 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = CE1F8523D8EE6CEC6DA717F1 /* Pods-deltachat-ios.debug.xcconfig */;
+			baseConfigurationReference = 3733C8B80B9236DBF6253372 /* Pods-deltachat-ios.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -2060,12 +2091,13 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
 		};
 		7A9FB1541FB061E2001FEA36 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 69816DF046E14DEB88695454 /* Pods-deltachat-ios.release.xcconfig */;
+			baseConfigurationReference = 2B36A26574DBF55EEACD7877 /* Pods-deltachat-ios.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -2132,16 +2164,39 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;
 		};
 		AE851A09227AECDF00ED86F0 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5F83FD2F5A5624AE4B5DB03E /* Pods-deltachat-iosTests.debug.xcconfig */;
+			baseConfigurationReference = 45FFE772E2F94FBE4E64F362 /* Pods-deltachat-iosTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_STYLE = Automatic;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageSVGKitPlugin\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SVGKit\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Swifter\"",
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjack.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageSVGKitPlugin/SDWebImageSVGKitPlugin.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SVGKit/SVGKit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Swifter/Swifter.framework/Headers\"",
+				);
 				INFOPLIST_FILE = "deltachat-iosTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2151,21 +2206,82 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-l\"xml2\"",
+					"-framework",
+					"\"AVFoundation\"",
+					"-framework",
+					"\"CocoaLumberjack\"",
+					"-framework",
+					"\"CoreGraphics\"",
+					"-framework",
+					"\"CoreTelephony\"",
+					"-framework",
+					"\"CoreText\"",
+					"-framework",
+					"\"Foundation\"",
+					"-framework",
+					"\"ImageIO\"",
+					"-framework",
+					"\"QuartzCore\"",
+					"-framework",
+					"\"Reachability\"",
+					"-framework",
+					"\"SCSiriWaveformView\"",
+					"-framework",
+					"\"SDWebImage\"",
+					"-framework",
+					"\"SDWebImageSVGKitPlugin\"",
+					"-framework",
+					"\"SDWebImageWebPCoder\"",
+					"-framework",
+					"\"SVGKit\"",
+					"-framework",
+					"\"Swifter\"",
+					"-framework",
+					"\"SystemConfiguration\"",
+					"-framework",
+					"\"UIKit\"",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "nayooti.deltachat-iosTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/deltachat-ios.app/deltachat-ios";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
 		};
 		AE851A0A227AECDF00ED86F0 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7A18F9878D3990857414EB1C /* Pods-deltachat-iosTests.release.xcconfig */;
+			baseConfigurationReference = B3ABD4C361673EE2C4E0DD66 /* Pods-deltachat-iosTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_STYLE = Automatic;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageSVGKitPlugin\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SVGKit\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Swifter\"",
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/CocoaLumberjack/CocoaLumberjack.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReachabilitySwift/Reachability.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SCSiriWaveformView/SCSiriWaveformView.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageSVGKitPlugin/SDWebImageSVGKitPlugin.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/SVGKit/SVGKit.framework/Headers\"",
+					"\"${PODS_CONFIGURATION_BUILD_DIR}/Swifter/Swifter.framework/Headers\"",
+				);
 				INFOPLIST_FILE = "deltachat-iosTests/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2174,11 +2290,50 @@
 					"@loader_path/Frameworks",
 				);
 				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-l\"xml2\"",
+					"-framework",
+					"\"AVFoundation\"",
+					"-framework",
+					"\"CocoaLumberjack\"",
+					"-framework",
+					"\"CoreGraphics\"",
+					"-framework",
+					"\"CoreTelephony\"",
+					"-framework",
+					"\"CoreText\"",
+					"-framework",
+					"\"Foundation\"",
+					"-framework",
+					"\"ImageIO\"",
+					"-framework",
+					"\"QuartzCore\"",
+					"-framework",
+					"\"Reachability\"",
+					"-framework",
+					"\"SCSiriWaveformView\"",
+					"-framework",
+					"\"SDWebImage\"",
+					"-framework",
+					"\"SDWebImageSVGKitPlugin\"",
+					"-framework",
+					"\"SDWebImageWebPCoder\"",
+					"-framework",
+					"\"SVGKit\"",
+					"-framework",
+					"\"Swifter\"",
+					"-framework",
+					"\"SystemConfiguration\"",
+					"-framework",
+					"\"UIKit\"",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "nayooti.deltachat-iosTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/deltachat-ios.app/deltachat-ios";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;
 		};