Merge branch 'develop'

Cartfile

@@ -1,16 +1,16 @@
-github "nextcloud/ios-communication-library" "v0.74"
-github "tilltue/TLPhotoPicker" "2.0.11"
+github "nextcloud/ios-communication-library" "v0.75"
+github "tilltue/TLPhotoPicker" "2.0.12"
 github "kishikawakatsumi/UICKeyChainStore" "v2.1.2"
 github "MortimerGoro/MGSwipeTableCell" "1.6.8"
 github "dzenbot/DZNEmptyDataSet" "v1.8.1"
 github "jdg/MBProgressHUD" "1.1.0"
-github "realm/realm-cocoa" 
+github "realm/realm-cocoa" "v5.3.2"
 github "SVGKit/SVGKit" "3.x"
 github "WeTransfer/WeScan" "1.2.0"
 github "malcommac/SwiftRichString"
 github "yannickl/QRCodeReader.swift" "10.1.1"
 github "weichsel/ZIPFoundation" "0.9.10"
-github "rechsteiner/Parchment" "v1.7.0"
+github "rechsteiner/Parchment" "v2.4.0"
 github "WenchaoD/FSCalendar" "2.8.0"
 github "AssistoLab/DropDown" "v2.3.13"
 github "krzyzanowskim/OpenSSL" "1.0.218"
@@ -19,7 +19,7 @@ github "scenee/FloatingPanel"
 github "ivanbruel/MarkdownKit"
 github "getsentry/sentry-cocoa"
 github "FabrizioBrancati/Queuer"
+github "xmartlabs/XLForm" ~> 4.1
 
 github "https://github.com/marinofaggiana/KTVHTTPCache" "2.0.2"
-github "https://github.com/marinofaggiana/XLForm" "master"
 github "https://github.com/marinofaggiana/TOPasscodeViewController" "0.0.7"

Cartfile.resolved

@@ -1,14 +1,14 @@
-github "Alamofire/Alamofire" "5.2.1"
+github "Alamofire/Alamofire" "5.2.2"
 github "AssistoLab/DropDown" "v2.3.13"
 github "CocoaLumberjack/CocoaLumberjack" "3.6.1"
 github "FabrizioBrancati/Queuer" "2.1.1"
 github "MortimerGoro/MGSwipeTableCell" "1.6.8"
-github "SVGKit/SVGKit" "2a4068f0ea546dcd82f7e4dd9aa9026c0a0a2235"
+github "SVGKit/SVGKit" "9240977515c04053f8c96c9dfdb764dc7b98b9ba"
 github "SwiftyJSON/SwiftyJSON" "5.0.0"
 github "WeTransfer/WeScan" "1.2.0"
 github "WenchaoD/FSCalendar" "2.8.0"
 github "dzenbot/DZNEmptyDataSet" "v1.8.1"
-github "getsentry/sentry-cocoa" "5.1.8"
+github "getsentry/sentry-cocoa" "5.1.10"
 github "huri000/QuickLayout" "3.0.0"
 github "huri000/SwiftEntryKit" "1.2.3"
 github "ivanbruel/MarkdownKit" "1.6"
@@ -18,12 +18,12 @@ github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
 github "marinofaggiana/TOPasscodeViewController" "0.0.7"
-github "marinofaggiana/XLForm" "eb9381ad8129f60402bf412250fb31b95a628a08"
-github "nextcloud/ios-communication-library" "v0.74"
-github "realm/realm-cocoa" "v5.2.0"
-github "rechsteiner/Parchment" "v1.7.0"
+github "nextcloud/ios-communication-library" "v0.75"
+github "realm/realm-cocoa" "v5.3.2"
+github "rechsteiner/Parchment" "v2.4.0"
 github "scenee/FloatingPanel" "v1.7.5"
-github "tilltue/TLPhotoPicker" "2.0.11"
+github "tilltue/TLPhotoPicker" "2.0.12"
 github "weichsel/ZIPFoundation" "0.9.10"
+github "xmartlabs/XLForm" "4.1.0"
 github "yahoojapan/SwiftyXMLParser" "5.2.0"
 github "yannickl/QRCodeReader.swift" "10.1.1"

Carthage/Checkouts/SVGKit/SVGKit.podspec

@@ -17,13 +17,10 @@ Pod::Spec.new do |s|
   s.source   = { :git => 'https://github.com/SVGKit/SVGKit.git', :tag => s.version.to_s }
 
   s.source_files = 'Source/*.{h,m}', 'Source/**/*.{h,m}'
-  s.ios.exclude_files = 'Source/AppKit additions/*.{h,m}', 'Source/Exporters/SVGKExporterNSImage.{h,m}'
-  s.tvos.exclude_files = 'Source/AppKit additions/*.{h,m}', 'Source/Exporters/SVGKExporterNSImage.{h,m}'
-  s.osx.exclude_files = 'Source/Exporters/SVGKExporterUIImage.{h,m}'
+  s.exclude_files = 'Source/include/*.h'
   s.libraries = 'xml2'
   s.framework = 'QuartzCore', 'CoreText'
   s.dependency 'CocoaLumberjack', '~> 3.0'
-  s.prefix_header_file = 'SVGKitLibrary/SVGKit-iOS/SVGKit-Prefix.pch'
   s.module_map = 'SVGKitLibrary/SVGKit-iOS/SVGKit.modulemap'
   s.requires_arc = true
   s.pod_target_xcconfig = {

Carthage/Checkouts/SVGKit/Source/AppKit additions/SVGKImageRep.h

@@ -6,6 +6,9 @@
 //
 //
 
+#import "SVGKDefine.h"
+
+#if SVGKIT_MAC
 #import <Cocoa/Cocoa.h>
 @class SVGKImage;
 @class SVGKSource;
@@ -36,3 +39,5 @@
 + (void)unloadSVGKImageRep;
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/AppKit additions/SVGKImageRep.m

@@ -7,11 +7,12 @@
 //
 
 #import "SVGKit.h"
+
+#if SVGKIT_MAC
 #import "SVGKSourceNSData.h"
 #import "SVGKSourceLocalFile.h"
 #import "SVGKSourceURL.h"
 #import "SVGKSourceString.h"
-#import "SVGKFastImageView.h"
 #import "SVGKImageRep.h"
 #import "SVGKImage+CGContext.h"
 #include <tgmath.h>
@@ -288,3 +289,5 @@ - (void)encodeWithCoder:(NSCoder *)aCoder
 }
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/DOM classes/Core DOM/CSSStyleDeclaration.m

@@ -5,6 +5,8 @@
 #import "CSSPrimitiveValue.h"
 #import "CocoaLumberjack/DDFileLogger.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface CSSStyleDeclaration()
 
 @property(nonatomic,strong) NSMutableDictionary* internalDictionaryOfStylesByCSSClass;

Carthage/Checkouts/SVGKit/Source/DOM classes/Core DOM/CSSValueList.m

@@ -1,5 +1,6 @@
 #import "CSSValueList.h"
 #import "CSSValue_ForSubclasses.h"
+#import "SVGKDefine_Private.h"
 
 @interface CSSValueList()
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Core DOM/Document.m

@@ -5,6 +5,8 @@
 
 #import "NodeList+Mutable.h" // needed for access to underlying array, because SVG doesnt specify how lists are made mutable
 
+#import "SVGKDefine_Private.h"
+
 @implementation Document
 
 @synthesize doctype;

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGClipPathElement.m

@@ -4,6 +4,8 @@
 
 #import "SVGHelperUtilities.h"
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGClipPathElement
 
 @synthesize clipPathUnits;

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGDocument.m

@@ -13,6 +13,8 @@
 
 #import "NamedNodeMap_Iterable.h" // needed for the allPrefixesByNamespace implementation
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGDocument
 
 

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGHelperUtilities.m

@@ -9,6 +9,8 @@
 #import "SVGSVGElement.h"
 #import "SVGGradientLayer.h"
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGHelperUtilities
 
 

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGLength.m

@@ -4,6 +4,7 @@
 #import "CSSPrimitiveValue_ConfigurablePixelsPerInch.h"
 
 #import "SVGUtils.h"
+#import "SVGKDefine_Private.h"
 
 #include <sys/types.h>
 #include <sys/sysctl.h>

Carthage/Checkouts/SVGKit/Source/DOM classes/SVG-DOM/SVGRect.m

@@ -1,4 +1,5 @@
 #import "SVGRect.h"
+#import "SVGKDefine_Private.h"
 
 BOOL SVGRectIsInitialized( SVGRect rect )
 {

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGCircleElement.m

@@ -6,6 +6,7 @@
 //
 
 #import "SVGCircleElement.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGCircleElement
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGElement.m

@@ -20,6 +20,8 @@
 
 #import "SVGTransformable.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGElement ()
 
 @property (nonatomic, copy) NSString *stringValue;

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGGradientElement.m

@@ -5,6 +5,7 @@
 #import "SVGGElement.h"
 #import "SVGLinearGradientElement.h"
 #import "SVGRadialGradientElement.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGGradientElement
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGImageElement.m

@@ -9,6 +9,8 @@
 #import "SVGKSourceNSData.h"
 #import "SVGKInlineResource.h"
 
+#import "SVGKDefine_Private.h"
+
 CGImageRef SVGImageCGImage(UIImage *img)
 {
 #if SVGKIT_UIKIT

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGLinearGradientElement.m

@@ -9,6 +9,7 @@
 #import "SVGLinearGradientElement.h"
 #import "SVGElement_ForParser.h"
 #import "SVGGradientLayer.h"
+#import "SVGKDefine_Private.h"
 
 @interface SVGLinearGradientElement ()
 

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGPathElement.m

@@ -12,6 +12,8 @@
 
 #import "SVGElement_ForParser.h" // to resolve Xcode circular dependencies; in long term, parsing SHOULD NOT HAPPEN inside any class whose name starts "SVG" (because those are reserved classes for the SVG Spec)
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGPathElement ()
 
 - (void) parseData:(NSString *)data;

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGRadialGradientElement.m

@@ -10,6 +10,7 @@
 #import "SVGElement_ForParser.h"
 #import "SVGUtils.h"
 #import "SVGGradientLayer.h"
+#import "SVGKDefine_Private.h"
 
 // `kCAGradientLayerRadial` this symbol is available since iOS 3.2/tvOS 9.0/macOS 10.6, but it's not externed to public header until Xcode 10 with iOS 12 SDK, so we define it for user who still use old SDK version.
 #define kCAGradientLayerRadial @"radial"

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGSVGElement.m

@@ -7,6 +7,8 @@
 
 #import "SVGElement_ForParser.h" // to resolve Xcode circular dependencies; in long term, parsing SHOULD NOT HAPPEN inside any class whose name starts "SVG" (because those are reserved classes for the SVG Spec)
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGSVGElement()
 #pragma mark - elements REQUIRED to implement the spec but not included in SVG Spec due to bugs in the spec writing!
 @property(nonatomic,readwrite) SVGRect requestedViewport;

Carthage/Checkouts/SVGKit/Source/DOM classes/Unported or Partial DOM/SVGTextElement.m

@@ -6,6 +6,7 @@
 #import "SVGHelperUtilities.h"
 #import "SVGUtils.h"
 #import "SVGTextLayer.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGTextElement
 

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKExporterNSImage.h

@@ -3,6 +3,10 @@
  
  Uses the default color format from UIGraphicsBeginImageContextWithOptions(...)
  */
+
+#import "SVGKDefine.h"
+
+#if SVGKIT_MAC
 #import <Foundation/Foundation.h>
 #import "SVGKImage.h"
 
@@ -29,3 +33,5 @@
 +(NSImage*) exportAsNSImage:(SVGKImage*) image antiAliased:(BOOL) shouldAntialias curveFlatnessFactor:(CGFloat) multiplyFlatness interpolationQuality:(CGInterpolationQuality) interpolationQuality;
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKExporterNSImage.m

@@ -1,7 +1,10 @@
 #import "SVGKExporterNSImage.h"
+
+#if SVGKIT_MAC
 #import "SVGUtils.h"
 #import "SVGKImage+CGContext.h" // needed for Context calls
 #import <objc/runtime.h>
+#import "SVGKDefine_Private.h"
 
 @implementation SVGKExporterNSImage
 
@@ -133,3 +136,5 @@ static void SVGKGraphicsEndImageContext(void) {
 }
 
 @end
+
+#endif /* SVGKIT_MAC */

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKExporterUIImage.m

@@ -1,5 +1,7 @@
 #import "SVGKExporterUIImage.h"
+#import "SVGKDefine_Private.h"
 
+#if SVGKIT_UIKIT
 #import "SVGKImage+CGContext.h" // needed for Context calls
 
 @implementation SVGKExporterUIImage
@@ -35,3 +37,5 @@ +(UIImage*) exportAsUIImage:(SVGKImage*) image antiAliased:(BOOL) shouldAntialia
 }
 
 @end
+
+#endif /* SVGKIT_UIKIT */

Carthage/Checkouts/SVGKit/Source/Exporters/SVGKImage+CGContext.m

@@ -11,6 +11,8 @@
 #import "SVGRect.h"
 #import "SVGSVGElement.h"
 
+#import "SVGKDefine_Private.h"
+
 @implementation SVGKImage (CGContext)
 
 -(CGContextRef) newCGContextAutosizedToFit

Carthage/Checkouts/SVGKit/Source/Foundation additions/NSCharacterSet+SVGKExtensions.m

@@ -7,6 +7,7 @@
 //
 
 #import "NSCharacterSet+SVGKExtensions.h"
+#import "SVGKDefine_Private.h"
 
 @implementation NSCharacterSet (SVGKExtensions)
 

Carthage/Checkouts/SVGKit/Source/Foundation additions/NSData+NSInputStream.m

@@ -7,7 +7,7 @@
 //
 
 #import "NSData+NSInputStream.h"
-
+#import "SVGKDefine_Private.h"
 
 #define BUFSIZE 65536U
 

Carthage/Checkouts/SVGKit/Source/Parsers/Parser Extensions/SVGKParserSVG.m

@@ -21,6 +21,8 @@
 
 #import "SVGDocument_Mutable.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGKParserSVG ()
 @property (nonatomic) NSArray *supportedNamespaces;
 @property (nonatomic) NSDictionary *elementMap;

Carthage/Checkouts/SVGKit/Source/Parsers/SVGKParseResult.m

@@ -1,4 +1,5 @@
 #import "SVGKParseResult.h"
+#import "SVGKDefine_Private.h"
 
 @implementation SVGKParseResult
 

Carthage/Checkouts/SVGKit/Source/Parsers/SVGKParser.m

@@ -31,6 +31,8 @@
 #import "StyleSheetList+Mutable.h"
 #import "NSData+NSInputStream.h"
 
+#import "SVGKDefine_Private.h"
+
 @interface SVGKParser()
 @property(nonatomic,strong, readwrite) SVGKSource* source;
 @property(nonatomic,strong, readwrite) NSMutableArray* externalStylesheets;