diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$ new file mode 100644 index 00000000..1b3b4f18 --- /dev/null +++ b/.idea/$PRODUCT_WORKSPACE_FILE$ @@ -0,0 +1,19 @@ + + + + + + + 10 + + + + + + + + \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..0e40fe8f --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ + +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/QuantiLogger.iml b/.idea/QuantiLogger.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/.idea/QuantiLogger.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..28a804d8 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..33247176 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 46f34adb..19eeb929 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode10.1 +osx_image: xcode11.2 env: global: before_install: diff --git a/Cartfile b/Cartfile index 1605ff8d..c6edbdbf 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ # RxSwift -github "ReactiveX/RxSwift" ~> 5.0 +github "ReactiveX/RxSwift" ~> 5.0 \ No newline at end of file diff --git a/Carthage/Build/.RxSwift.version b/Carthage/Build/.RxSwift.version index df7f5dc6..df4d28f5 100644 --- a/Carthage/Build/.RxSwift.version +++ b/Carthage/Build/.RxSwift.version @@ -1,106 +1,30 @@ { + "commitish" : "5.0.1", "Mac" : [ { "name" : "RxRelay", - "hash" : "5d58d55adc71ea09e9328f8442d2b73aa7280007ab40114f5300ad3bdb8c3b42", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxBlocking", - "hash" : "0eb5765fc2eae51d0701dc6cd4e3110b47858058b35fafbb812a3c212322d2df", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxTest", - "hash" : "c750b865b83ca37e3bea3611de0a384d98eaa3fe00451f5467ded7a0677daf6b", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxCocoa", - "hash" : "8d601a9b8fad8170e8f8a05f44f5ad8226481d45e590df8f21e62cf504e1a8d6", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxSwift", - "hash" : "df6054bdb79ed0f2cab50b018f89d61a138ff1ba3022486f68b92a40a78a4990", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - } - ], - "watchOS" : [ - { - "name" : "RxRelay", - "hash" : "2b58a87e387859cc99cc5072860c0d5fbb2875c5cb91a93fcb0c22cc203b7c74", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxBlocking", - "hash" : "6082ce8fbf97c42c055570558519bb5abbe8b40265e1ef0ec9c9486d76e27cd2", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxCocoa", - "hash" : "6ba1ecc9f3eba24d177cf8caa4ed0816b8b45963f6300eb39089b538cf9629ed", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxSwift", - "hash" : "e03bbdd21d6c7585bdc7999337c4e2e9555c5b36e8cc05b2c9bd8db792764bec", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - } - ], - "tvOS" : [ - { - "name" : "RxBlocking", - "hash" : "5652b5f21cc8f171d2bf7d58d012155af5dabb81692aa1312d97bfaa66544640", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxRelay", - "hash" : "7e493c38b90bb7ae50e9b5caae7153282bb65ed24b88a9a3a40532e0d7356f0a", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" + "hash" : "b991c29c126882ec26993d1ca8a6a49458313df3ad2cb232036a9b193e30df1b", + "swiftToolchainVersion" : "5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9)" }, { "name" : "RxTest", - "hash" : "471479e2558df08dc2674ceaa5de1ad86ef4a12c50c43ea619ba5f27870b9842", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxCocoa", - "hash" : "d0e941ec6914c512a9e84d67e23ef86dae47561a92a89713589495c84c2668ea", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" + "hash" : "db67757c3cb6c4378479c1f65cccd33a278cb659c3fc5c74ac0e89e368caaaee", + "swiftToolchainVersion" : "5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9)" }, - { - "name" : "RxSwift", - "hash" : "a8fed39ac211029f4dd1a6f6ca77974489b571d6f634038d6584215b0064d6aa", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - } - ], - "commitish" : "5.0.1", - "iOS" : [ { "name" : "RxBlocking", - "hash" : "6dc57688696790cbaa9fc39170233af95805cc642c618b14da53bde8ee77d35a", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxRelay", - "hash" : "8fa247f1991b52d90d4ef2b6ce7bc50c4e6e876833ddc4035c396c6d5ba78c4e", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" - }, - { - "name" : "RxTest", - "hash" : "9115267a821d3da205d3a12bb3ca306a9263dc266e82cda936580d03d14ca486", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" + "hash" : "2fd0594beac82acf49ff20d5c620e16796b03dea00eb6dd115b1e2c798bb0333", + "swiftToolchainVersion" : "5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9)" }, { "name" : "RxCocoa", - "hash" : "853a44ecee6075f92c5ef9a288f543f1217ee8731bd588462e0360816ce4ffe5", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" + "hash" : "eb00b6a685f4f85f47f0baad6a67636f183ea069fbd3a06baa380dca7155d7d2", + "swiftToolchainVersion" : "5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9)" }, { "name" : "RxSwift", - "hash" : "b0c425b93fd0032dff66bb0d77831da0a817c12d4cffc222042b9f5f36f47efe", - "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" + "hash" : "8e79ea500aeb1ef4626caf10601c47610caf49d416157abdea18893718ac0678", + "swiftToolchainVersion" : "5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9)" } ] } \ No newline at end of file diff --git a/Carthage/Build/Mac/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking b/Carthage/Build/Mac/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking index 7b9ada84..392a82a6 100644 Binary files a/Carthage/Build/Mac/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking and b/Carthage/Build/Mac/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking differ diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Headers/RxBlocking-Swift.h b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Headers/RxBlocking-Swift.h index 2246fb63..e7388610 100644 --- a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Headers/RxBlocking-Swift.h +++ b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Headers/RxBlocking-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc index 12a88c61..18d6f88f 100644 Binary files a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule index 853807e9..f25549da 100644 Binary files a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Resources/Info.plist index e0cba74c..1946079b 100644 --- a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Resources/Info.plist +++ b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18F132 + 19B88 CFBundleDevelopmentRegion en CFBundleExecutable @@ -29,17 +29,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11A1027 + 11B500 DTPlatformVersion GM DTSDKBuild - 19A547 + 19B89 DTSDKName macosx10.15 DTXcode - 1110 + 1120 DTXcodeBuild - 11A1027 + 11B500 LSMinimumSystemVersion 10.9 UIDeviceFamily diff --git a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/RxBlocking b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/RxBlocking index a453809f..c32ca049 100755 Binary files a/Carthage/Build/Mac/RxBlocking.framework/Versions/A/RxBlocking and b/Carthage/Build/Mac/RxBlocking.framework/Versions/A/RxBlocking differ diff --git a/Carthage/Build/Mac/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa b/Carthage/Build/Mac/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa index ff296f06..d6ccebcf 100644 Binary files a/Carthage/Build/Mac/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa and b/Carthage/Build/Mac/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa differ diff --git a/Carthage/Build/Mac/RxCocoa.framework/Headers b/Carthage/Build/Mac/RxCocoa.framework/Headers deleted file mode 120000 index a177d2a6..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Carthage/Build/Mac/RxCocoa.framework/Modules b/Carthage/Build/Mac/RxCocoa.framework/Modules deleted file mode 120000 index 5736f318..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/Carthage/Build/Mac/RxCocoa.framework/Resources b/Carthage/Build/Mac/RxCocoa.framework/Resources deleted file mode 120000 index 953ee36f..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Carthage/Build/Mac/RxCocoa.framework/RxCocoa b/Carthage/Build/Mac/RxCocoa.framework/RxCocoa deleted file mode 120000 index 9f0992d2..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/RxCocoa +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/RxCocoa \ No newline at end of file diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/RxCocoa-Swift.h b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/RxCocoa-Swift.h deleted file mode 100644 index bf493f74..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/RxCocoa-Swift.h +++ /dev/null @@ -1,224 +0,0 @@ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -typedef double swift_double4 __attribute__((__ext_vector_type__(4))); -typedef int swift_int2 __attribute__((__ext_vector_type__(2))); -typedef int swift_int3 __attribute__((__ext_vector_type__(3))); -typedef int swift_int4 __attribute__((__ext_vector_type__(4))); -typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); -typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); -typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -#endif - -#if !defined(SWIFT_PASTE) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#if !defined(SWIFT_METATYPE) -# define SWIFT_METATYPE(X) Class -#endif -#if !defined(SWIFT_CLASS_PROPERTY) -# if __has_feature(objc_class_property) -# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ -# else -# define SWIFT_CLASS_PROPERTY(...) -# endif -#endif - -#if __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif -#if !defined(SWIFT_RESILIENT_CLASS) -# if __has_attribute(objc_class_stub) -# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub)) -# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME) -# else -# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) -# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME) -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility))) -# else -# define SWIFT_ENUM_ATTR(_extensibility) -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type -# else -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility) -# endif -#endif -#if !defined(SWIFT_UNAVAILABLE) -# define SWIFT_UNAVAILABLE __attribute__((unavailable)) -#endif -#if !defined(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_WEAK_IMPORT) -# define SWIFT_WEAK_IMPORT __attribute__((weak_import)) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if !defined(IBSegueAction) -# define IBSegueAction -#endif -#if __has_feature(modules) -#if __has_warning("-Watimport-in-framework-header") -#pragma clang diagnostic ignored "-Watimport-in-framework-header" -#endif -@import AppKit; -@import ObjectiveC; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="RxCocoa",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - -SWIFT_CLASS("_TtC7RxCocoa8RxTarget") -@interface RxTarget : NSObject -- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; -@end - -@class NSControl; - -SWIFT_CLASS("_TtC7RxCocoa13ControlTarget") -@interface ControlTarget : RxTarget -- (void)eventHandler:(NSControl * _Null_unspecified)sender; -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/RxCocoa.h b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/RxCocoa.h deleted file mode 100644 index 7436904d..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/RxCocoa.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// RxCocoa.h -// RxCocoa -// -// Created by Krunoslav Zaher on 2/21/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#import -#import "_RX.h" -#import "_RXDelegateProxy.h" -#import "_RXKVOObserver.h" -#import "_RXObjCRuntime.h" - -//! Project version number for RxCocoa. -FOUNDATION_EXPORT double RxCocoaVersionNumber; - -//! Project version string for RxCocoa. -FOUNDATION_EXPORT const unsigned char RxCocoaVersionString[]; \ No newline at end of file diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RX.h b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RX.h deleted file mode 100644 index b868ac97..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RX.h +++ /dev/null @@ -1,93 +0,0 @@ -// -// _RX.h -// RxCocoa -// -// Created by Krunoslav Zaher on 7/12/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#import -#import - -/** - ################################################################################ - This file is part of RX private API - ################################################################################ - */ - -#if TRACE_RESOURCES >= 2 -# define DLOG(...) NSLog(__VA_ARGS__) -#else -# define DLOG(...) -#endif - -#if DEBUG -# define ABORT_IN_DEBUG abort(); -#else -# define ABORT_IN_DEBUG -#endif - - -#define SEL_VALUE(x) [NSValue valueWithPointer:(x)] -#define CLASS_VALUE(x) [NSValue valueWithNonretainedObject:(x)] -#define IMP_VALUE(x) [NSValue valueWithPointer:(x)] - -/** - Checks that the local `error` instance exists before assigning it's value by reference. - This macro exists to work around static analysis warnings — `NSError` is always assumed to be `nullable`, even though we explicitly define the method parameter as `nonnull`. See http://www.openradar.me/21766176 for more details. - */ -#define RX_THROW_ERROR(errorValue, returnValue) if (error != nil) { *error = (errorValue); } return (returnValue); - -#define RX_CAT2(_1, _2) _RX_CAT2(_1, _2) -#define _RX_CAT2(_1, _2) _1 ## _2 - -#define RX_ELEMENT_AT(n, ...) RX_CAT2(_RX_ELEMENT_AT_, n)(__VA_ARGS__) -#define _RX_ELEMENT_AT_0(x, ...) x -#define _RX_ELEMENT_AT_1(_0, x, ...) x -#define _RX_ELEMENT_AT_2(_0, _1, x, ...) x -#define _RX_ELEMENT_AT_3(_0, _1, _2, x, ...) x -#define _RX_ELEMENT_AT_4(_0, _1, _2, _3, x, ...) x -#define _RX_ELEMENT_AT_5(_0, _1, _2, _3, _4, x, ...) x -#define _RX_ELEMENT_AT_6(_0, _1, _2, _3, _4, _5, x, ...) x - -#define RX_COUNT(...) RX_ELEMENT_AT(6, ## __VA_ARGS__, 6, 5, 4, 3, 2, 1, 0) -#define RX_EMPTY(...) RX_ELEMENT_AT(6, ## __VA_ARGS__, 0, 0, 0, 0, 0, 0, 1) - -/** - #define SUM(context, index, head, tail) head + tail - #define MAP(context, index, element) (context)[index] * (element) - - RX_FOR(numbers, SUM, MAP, b0, b1, b2); - - (numbers)[0] * (b0) + (numbers)[1] * (b1) + (numbers[2]) * (b2) - */ - -#define RX_FOREACH(context, concat, map, ...) RX_FOR_MAX(RX_COUNT(__VA_ARGS__), _RX_FOREACH_CONCAT, _RX_FOREACH_MAP, context, concat, map, __VA_ARGS__) -#define _RX_FOREACH_CONCAT(index, head, tail, context, concat, map, ...) concat(context, index, head, tail) -#define _RX_FOREACH_MAP(index, context, concat, map, ...) map(context, index, RX_ELEMENT_AT(index, __VA_ARGS__)) - -/** - #define MAP(context, index, item) (context)[index] * (item) - - RX_FOR_COMMA(numbers, MAP, b0, b1); - - ,(numbers)[0] * b0, (numbers)[1] * b1 - */ -#define RX_FOREACH_COMMA(context, map, ...) RX_CAT2(_RX_FOREACH_COMMA_EMPTY_, RX_EMPTY(__VA_ARGS__))(context, map, ## __VA_ARGS__) -#define _RX_FOREACH_COMMA_EMPTY_1(context, map, ...) -#define _RX_FOREACH_COMMA_EMPTY_0(context, map, ...) , RX_FOR_MAX(RX_COUNT(__VA_ARGS__), _RX_FOREACH_COMMA_CONCAT, _RX_FOREACH_COMMA_MAP, context, map, __VA_ARGS__) -#define _RX_FOREACH_COMMA_CONCAT(index, head, tail, context, map, ...) head, tail -#define _RX_FOREACH_COMMA_MAP(index, context, map, ...) map(context, index, RX_ELEMENT_AT(index, __VA_ARGS__)) - -// rx for - -#define RX_FOR_MAX(max, concat, map, ...) RX_CAT2(RX_FOR_, max)(concat, map, ## __VA_ARGS__) - -#define RX_FOR_0(concat, map, ...) -#define RX_FOR_1(concat, map, ...) map(0, __VA_ARGS__) -#define RX_FOR_2(concat, map, ...) concat(1, RX_FOR_1(concat, map, ## __VA_ARGS__), map(1, __VA_ARGS__), __VA_ARGS__) -#define RX_FOR_3(concat, map, ...) concat(2, RX_FOR_2(concat, map, ## __VA_ARGS__), map(2, __VA_ARGS__), __VA_ARGS__) -#define RX_FOR_4(concat, map, ...) concat(3, RX_FOR_3(concat, map, ## __VA_ARGS__), map(3, __VA_ARGS__), __VA_ARGS__) -#define RX_FOR_5(concat, map, ...) concat(4, RX_FOR_4(concat, map, ## __VA_ARGS__), map(4, __VA_ARGS__), __VA_ARGS__) -#define RX_FOR_6(concat, map, ...) concat(5, RX_FOR_5(concat, map, ## __VA_ARGS__), map(5, __VA_ARGS__), __VA_ARGS__) - diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXDelegateProxy.h b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXDelegateProxy.h deleted file mode 100644 index e1cc207d..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXDelegateProxy.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// _RXDelegateProxy.h -// RxCocoa -// -// Created by Krunoslav Zaher on 7/4/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface _RXDelegateProxy : NSObject - -@property (nonatomic, weak, readonly) id _forwardToDelegate; - --(void)_setForwardToDelegate:(id __nullable)forwardToDelegate retainDelegate:(BOOL)retainDelegate NS_SWIFT_NAME(_setForwardToDelegate(_:retainDelegate:)) ; - --(BOOL)hasWiredImplementationForSelector:(SEL)selector; --(BOOL)voidDelegateMethodsContain:(SEL)selector; - --(void)_sentMessage:(SEL)selector withArguments:(NSArray*)arguments; --(void)_methodInvoked:(SEL)selector withArguments:(NSArray*)arguments; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXKVOObserver.h b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXKVOObserver.h deleted file mode 100644 index adcfd0a3..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXKVOObserver.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// _RXKVOObserver.h -// RxCocoa -// -// Created by Krunoslav Zaher on 7/11/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#import - -/** - ################################################################################ - This file is part of RX private API - ################################################################################ - */ - -// Exists because if written in Swift, reading unowned is disabled during dealloc process -@interface _RXKVOObserver : NSObject - --(instancetype)initWithTarget:(id)target - retainTarget:(BOOL)retainTarget - keyPath:(NSString*)keyPath - options:(NSKeyValueObservingOptions)options - callback:(void (^)(id))callback; - --(void)dispose; - -@end diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXObjCRuntime.h b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXObjCRuntime.h deleted file mode 100644 index bc6a76af..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Headers/_RXObjCRuntime.h +++ /dev/null @@ -1,102 +0,0 @@ -// -// _RXObjCRuntime.h -// RxCocoa -// -// Created by Krunoslav Zaher on 7/11/15. -// Copyright © 2015 Krunoslav Zaher. All rights reserved. -// - -#import - -#if !DISABLE_SWIZZLING - -/** - ################################################################################ - This file is part of RX private API - ################################################################################ - */ - -/** - This flag controls `RELEASE` configuration behavior in case race was detecting while modifying - ObjC runtime. - - In case this value is set to `YES`, after runtime race is detected, `abort()` will be called. - Otherwise, only error will be reported using normal error reporting mechanism. - - In `DEBUG` mode `abort` will be always called in case race is detected. - - Races can't happen in case this is the only library modifying ObjC runtime, but in case there are multiple libraries - changing ObjC runtime, race conditions can occur because there is no way to synchronize multiple libraries unaware of - each other. - - To help remedy this situation this library will use `synchronized` on target object and it's meta-class, but - there aren't any guarantees of how other libraries will behave. - - Default value is `NO`. - - */ -extern BOOL RXAbortOnThreadingHazard; - -/// Error domain for RXObjCRuntime. -extern NSString * __nonnull const RXObjCRuntimeErrorDomain; - -/// `userInfo` key with additional information is interceptor probably KVO. -extern NSString * __nonnull const RXObjCRuntimeErrorIsKVOKey; - -typedef NS_ENUM(NSInteger, RXObjCRuntimeError) { - RXObjCRuntimeErrorUnknown = 1, - RXObjCRuntimeErrorObjectMessagesAlreadyBeingIntercepted = 2, - RXObjCRuntimeErrorSelectorNotImplemented = 3, - RXObjCRuntimeErrorCantInterceptCoreFoundationTollFreeBridgedObjects = 4, - RXObjCRuntimeErrorThreadingCollisionWithOtherInterceptionMechanism = 5, - RXObjCRuntimeErrorSavingOriginalForwardingMethodFailed = 6, - RXObjCRuntimeErrorReplacingMethodWithForwardingImplementation = 7, - RXObjCRuntimeErrorObservingPerformanceSensitiveMessages = 8, - RXObjCRuntimeErrorObservingMessagesWithUnsupportedReturnType = 9, -}; - -/// Transforms normal selector into a selector with RX prefix. -SEL _Nonnull RX_selector(SEL _Nonnull selector); - -/// Transforms selector into a unique pointer (because of Swift conversion rules) -void * __nonnull RX_reference_from_selector(SEL __nonnull selector); - -/// Protocol that interception observers must implement. -@protocol RXMessageSentObserver - -/// In case the same selector is being intercepted for a pair of base/sub classes, -/// this property will differentiate between interceptors that need to fire. -@property (nonatomic, assign, readonly) IMP __nonnull targetImplementation; - --(void)messageSentWithArguments:(NSArray* __nonnull)arguments; --(void)methodInvokedWithArguments:(NSArray* __nonnull)arguments; - -@end - -/// Protocol that deallocating observer must implement. -@protocol RXDeallocatingObserver - -/// In case the same selector is being intercepted for a pair of base/sub classes, -/// this property will differentiate between interceptors that need to fire. -@property (nonatomic, assign, readonly) IMP __nonnull targetImplementation; - --(void)deallocating; - -@end - -/// Ensures interceptor is installed on target object. -IMP __nullable RX_ensure_observing(id __nonnull target, SEL __nonnull selector, NSError *__autoreleasing __nullable * __nullable error); - -#endif - -/// Extracts arguments for `invocation`. -NSArray * __nonnull RX_extract_arguments(NSInvocation * __nonnull invocation); - -/// Returns `YES` in case method has `void` return type. -BOOL RX_is_method_with_description_void(struct objc_method_description method); - -/// Returns `YES` in case methodSignature has `void` return type. -BOOL RX_is_method_signature_void(NSMethodSignature * __nonnull methodSignature); - -/// Default value for `RXInterceptionObserver.targetImplementation`. -IMP __nonnull RX_default_target_implementation(void); diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/RxCocoa.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/RxCocoa.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index fe4f06db..00000000 Binary files a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/RxCocoa.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/RxCocoa.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/RxCocoa.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 1ab4aed1..00000000 Binary files a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/RxCocoa.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/module.modulemap b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index 5df6ca7b..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,11 +0,0 @@ -framework module RxCocoa { - umbrella header "RxCocoa.h" - - export * - module * { export * } -} - -module RxCocoa.Swift { - header "RxCocoa-Swift.h" - requires objc -} diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index f825a693..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,53 +0,0 @@ - - - - - BuildMachineOSBuild - 18F132 - CFBundleDevelopmentRegion - en - CFBundleExecutable - RxCocoa - CFBundleIdentifier - io.rx.RxCocoa - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - RxCocoa - CFBundlePackageType - FMWK - CFBundleShortVersionString - 5.0.1 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 11A1027 - DTPlatformVersion - GM - DTSDKBuild - 19A547 - DTSDKName - macosx10.15 - DTXcode - 1110 - DTXcodeBuild - 11A1027 - LSMinimumSystemVersion - 10.9 - UIDeviceFamily - - 1 - 2 - 3 - 4 - - - diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/RxCocoa b/Carthage/Build/Mac/RxCocoa.framework/Versions/A/RxCocoa deleted file mode 100755 index a3eb11cb..00000000 Binary files a/Carthage/Build/Mac/RxCocoa.framework/Versions/A/RxCocoa and /dev/null differ diff --git a/Carthage/Build/Mac/RxCocoa.framework/Versions/Current b/Carthage/Build/Mac/RxCocoa.framework/Versions/Current deleted file mode 120000 index 8c7e5a66..00000000 --- a/Carthage/Build/Mac/RxCocoa.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/Carthage/Build/Mac/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift b/Carthage/Build/Mac/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift index 4e1a6393..b5c06bf1 100644 Binary files a/Carthage/Build/Mac/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift and b/Carthage/Build/Mac/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift differ diff --git a/Carthage/Build/Mac/RxSwift.framework/Headers b/Carthage/Build/Mac/RxSwift.framework/Headers deleted file mode 120000 index a177d2a6..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Carthage/Build/Mac/RxSwift.framework/Modules b/Carthage/Build/Mac/RxSwift.framework/Modules deleted file mode 120000 index 5736f318..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/Carthage/Build/Mac/RxSwift.framework/Resources b/Carthage/Build/Mac/RxSwift.framework/Resources deleted file mode 120000 index 953ee36f..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Carthage/Build/Mac/RxSwift.framework/RxSwift b/Carthage/Build/Mac/RxSwift.framework/RxSwift deleted file mode 120000 index 9a40a69d..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/RxSwift +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/RxSwift \ No newline at end of file diff --git a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Headers/RxSwift-Swift.h b/Carthage/Build/Mac/RxSwift.framework/Versions/A/Headers/RxSwift-Swift.h deleted file mode 100644 index 6a429f20..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Headers/RxSwift-Swift.h +++ /dev/null @@ -1,219 +0,0 @@ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wgcc-compat" - -#if !defined(__has_include) -# define __has_include(x) 0 -#endif -#if !defined(__has_attribute) -# define __has_attribute(x) 0 -#endif -#if !defined(__has_feature) -# define __has_feature(x) 0 -#endif -#if !defined(__has_warning) -# define __has_warning(x) 0 -#endif - -#if __has_include() -# include -#endif - -#pragma clang diagnostic ignored "-Wauto-import" -#include -#include -#include -#include - -#if !defined(SWIFT_TYPEDEFS) -# define SWIFT_TYPEDEFS 1 -# if __has_include() -# include -# elif !defined(__cplusplus) -typedef uint_least16_t char16_t; -typedef uint_least32_t char32_t; -# endif -typedef float swift_float2 __attribute__((__ext_vector_type__(2))); -typedef float swift_float3 __attribute__((__ext_vector_type__(3))); -typedef float swift_float4 __attribute__((__ext_vector_type__(4))); -typedef double swift_double2 __attribute__((__ext_vector_type__(2))); -typedef double swift_double3 __attribute__((__ext_vector_type__(3))); -typedef double swift_double4 __attribute__((__ext_vector_type__(4))); -typedef int swift_int2 __attribute__((__ext_vector_type__(2))); -typedef int swift_int3 __attribute__((__ext_vector_type__(3))); -typedef int swift_int4 __attribute__((__ext_vector_type__(4))); -typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2))); -typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3))); -typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); -#endif - -#if !defined(SWIFT_PASTE) -# define SWIFT_PASTE_HELPER(x, y) x##y -# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y) -#endif -#if !defined(SWIFT_METATYPE) -# define SWIFT_METATYPE(X) Class -#endif -#if !defined(SWIFT_CLASS_PROPERTY) -# if __has_feature(objc_class_property) -# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ -# else -# define SWIFT_CLASS_PROPERTY(...) -# endif -#endif - -#if __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) -#endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) -#endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) -#endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE -#endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT -#endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN -#endif -#if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA -#endif -#if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA -#endif -#if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA -#endif -#if !defined(SWIFT_CLASS) -# if __has_attribute(objc_subclassing_restricted) -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# else -# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA -# endif -#endif -#if !defined(SWIFT_RESILIENT_CLASS) -# if __has_attribute(objc_class_stub) -# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub)) -# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME) -# else -# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) -# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME) -# endif -#endif - -#if !defined(SWIFT_PROTOCOL) -# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA -#endif - -#if !defined(SWIFT_EXTENSION) -# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) -#endif - -#if !defined(OBJC_DESIGNATED_INITIALIZER) -# if __has_attribute(objc_designated_initializer) -# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) -# else -# define OBJC_DESIGNATED_INITIALIZER -# endif -#endif -#if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) -# define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility))) -# else -# define SWIFT_ENUM_ATTR(_extensibility) -# endif -#endif -#if !defined(SWIFT_ENUM) -# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type -# if __has_feature(generalized_swift_name) -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type -# else -# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility) -# endif -#endif -#if !defined(SWIFT_UNAVAILABLE) -# define SWIFT_UNAVAILABLE __attribute__((unavailable)) -#endif -#if !defined(SWIFT_UNAVAILABLE_MSG) -# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg))) -#endif -#if !defined(SWIFT_AVAILABILITY) -# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__))) -#endif -#if !defined(SWIFT_WEAK_IMPORT) -# define SWIFT_WEAK_IMPORT __attribute__((weak_import)) -#endif -#if !defined(SWIFT_DEPRECATED) -# define SWIFT_DEPRECATED __attribute__((deprecated)) -#endif -#if !defined(SWIFT_DEPRECATED_MSG) -# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) -#endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) -#endif -#if !defined(IBSegueAction) -# define IBSegueAction -#endif -#if __has_feature(modules) -#if __has_warning("-Watimport-in-framework-header") -#pragma clang diagnostic ignored "-Watimport-in-framework-header" -#endif -@import Foundation; -@import ObjectiveC; -#endif - -#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch" -#pragma clang diagnostic ignored "-Wduplicate-method-arg" -#if __has_warning("-Wpragma-clang-attribute") -# pragma clang diagnostic ignored "-Wpragma-clang-attribute" -#endif -#pragma clang diagnostic ignored "-Wunknown-pragmas" -#pragma clang diagnostic ignored "-Wnullability" - -#if __has_attribute(external_source_symbol) -# pragma push_macro("any") -# undef any -# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="RxSwift",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol)) -# pragma pop_macro("any") -#endif - - -SWIFT_CLASS("_TtC7RxSwift9AtomicInt") -@interface AtomicInt : NSLock -- (nonnull instancetype)init SWIFT_UNAVAILABLE; -+ (nonnull instancetype)new SWIFT_UNAVAILABLE_MSG("-init is unavailable"); -@end - - - - - - - -#if __has_attribute(external_source_symbol) -# pragma clang attribute pop -#endif -#pragma clang diagnostic pop diff --git a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/RxSwift.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/RxSwift.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 7700c67b..00000000 Binary files a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/RxSwift.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/RxSwift.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/RxSwift.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 41024d1c..00000000 Binary files a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/RxSwift.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/module.modulemap b/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index 16df5f1d..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,4 +0,0 @@ -framework module RxSwift { - header "RxSwift-Swift.h" - requires objc -} diff --git a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/RxSwift.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index fe587211..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,53 +0,0 @@ - - - - - BuildMachineOSBuild - 18F132 - CFBundleDevelopmentRegion - en - CFBundleExecutable - RxSwift - CFBundleIdentifier - io.rx.RxSwift - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - RxSwift - CFBundlePackageType - FMWK - CFBundleShortVersionString - 5.0.1 - CFBundleSignature - ???? - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 11A1027 - DTPlatformVersion - GM - DTSDKBuild - 19A547 - DTSDKName - macosx10.15 - DTXcode - 1110 - DTXcodeBuild - 11A1027 - LSMinimumSystemVersion - 10.9 - UIDeviceFamily - - 1 - 2 - 3 - 4 - - - diff --git a/Carthage/Build/Mac/RxSwift.framework/Versions/A/RxSwift b/Carthage/Build/Mac/RxSwift.framework/Versions/A/RxSwift deleted file mode 100755 index 0829bf0b..00000000 Binary files a/Carthage/Build/Mac/RxSwift.framework/Versions/A/RxSwift and /dev/null differ diff --git a/Carthage/Build/Mac/RxSwift.framework/Versions/Current b/Carthage/Build/Mac/RxSwift.framework/Versions/Current deleted file mode 120000 index 8c7e5a66..00000000 --- a/Carthage/Build/Mac/RxSwift.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/Carthage/Build/Mac/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest b/Carthage/Build/Mac/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest index caac5502..6f825c0f 100644 Binary files a/Carthage/Build/Mac/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest and b/Carthage/Build/Mac/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest differ diff --git a/Carthage/Build/Mac/RxTest.framework/Versions/A/Headers/RxTest-Swift.h b/Carthage/Build/Mac/RxTest.framework/Versions/A/Headers/RxTest-Swift.h index 6c49a1d0..3f88994f 100644 --- a/Carthage/Build/Mac/RxTest.framework/Versions/A/Headers/RxTest-Swift.h +++ b/Carthage/Build/Mac/RxTest.framework/Versions/A/Headers/RxTest-Swift.h @@ -1,4 +1,4 @@ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" diff --git a/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftdoc b/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftdoc index e8852335..efaeb6e0 100644 Binary files a/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftmodule b/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftmodule index 81906aef..6381ba15 100644 Binary files a/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/Mac/RxTest.framework/Versions/A/Modules/RxTest.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/Mac/RxTest.framework/Versions/A/Resources/Info.plist b/Carthage/Build/Mac/RxTest.framework/Versions/A/Resources/Info.plist index cc4905d2..be276ba1 100644 --- a/Carthage/Build/Mac/RxTest.framework/Versions/A/Resources/Info.plist +++ b/Carthage/Build/Mac/RxTest.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 18F132 + 19B88 CFBundleDevelopmentRegion en CFBundleExecutable @@ -29,17 +29,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 11A1027 + 11B500 DTPlatformVersion GM DTSDKBuild - 19A547 + 19B89 DTSDKName macosx10.15 DTXcode - 1110 + 1120 DTXcodeBuild - 11A1027 + 11B500 LSMinimumSystemVersion 10.9 UIDeviceFamily diff --git a/Carthage/Build/Mac/RxTest.framework/Versions/A/RxTest b/Carthage/Build/Mac/RxTest.framework/Versions/A/RxTest index 63f10217..a63f97a3 100755 Binary files a/Carthage/Build/Mac/RxTest.framework/Versions/A/RxTest and b/Carthage/Build/Mac/RxTest.framework/Versions/A/RxTest differ diff --git a/Carthage/Build/iOS/DataCompression.framework.dSYM/Contents/Info.plist b/Carthage/Build/iOS/DataCompression.framework.dSYM/Contents/Info.plist new file mode 100644 index 00000000..e27a3c5d --- /dev/null +++ b/Carthage/Build/iOS/DataCompression.framework.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.DataCompression + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/Carthage/Build/iOS/DataCompression.framework.dSYM/Contents/Resources/DWARF/DataCompression b/Carthage/Build/iOS/DataCompression.framework.dSYM/Contents/Resources/DWARF/DataCompression new file mode 100644 index 00000000..1c3bee90 Binary files /dev/null and b/Carthage/Build/iOS/DataCompression.framework.dSYM/Contents/Resources/DWARF/DataCompression differ diff --git a/Carthage/Build/iOS/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking b/Carthage/Build/iOS/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking index 708e4943..d872207e 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking and b/Carthage/Build/iOS/RxBlocking.framework.dSYM/Contents/Resources/DWARF/RxBlocking differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Headers/RxBlocking-Swift.h b/Carthage/Build/iOS/RxBlocking.framework/Headers/RxBlocking-Swift.h index a6e84a04..3a1f28da 100644 --- a/Carthage/Build/iOS/RxBlocking.framework/Headers/RxBlocking-Swift.h +++ b/Carthage/Build/iOS/RxBlocking.framework/Headers/RxBlocking-Swift.h @@ -4,7 +4,7 @@ #if TARGET_OS_SIMULATOR #if 0 #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -220,7 +220,7 @@ SWIFT_CLASS("_TtC10RxBlocking9AtomicInt") #pragma clang diagnostic pop #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -440,7 +440,7 @@ SWIFT_CLASS("_TtC10RxBlocking9AtomicInt") #else #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -656,7 +656,7 @@ SWIFT_CLASS("_TtC10RxBlocking9AtomicInt") #pragma clang diagnostic pop #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" diff --git a/Carthage/Build/iOS/RxBlocking.framework/Info.plist b/Carthage/Build/iOS/RxBlocking.framework/Info.plist index c1196324..67045d5e 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Info.plist and b/Carthage/Build/iOS/RxBlocking.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftdoc index 8f654369..e0d09577 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftmodule index 2e2d4438..77408a87 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftdoc index 88bf91b2..0667f309 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftmodule index 9ed3c64e..17c96970 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftdoc index 88bf91b2..0667f309 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftmodule index 9ed3c64e..17c96970 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftdoc index 8f654369..e0d09577 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftmodule index 2e2d4438..77408a87 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftdoc index 8f654369..e0d09577 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftmodule index 2e2d4438..77408a87 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/armv7.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftdoc index 10ee09df..78be5b4d 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftmodule index 4c734bf6..575b67b8 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftdoc index 10ee09df..78be5b4d 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftmodule index 4c734bf6..575b67b8 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index f569bca2..06b60e9b 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftmodule index 643b83b4..d2d34fdf 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc index f569bca2..06b60e9b 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule index 643b83b4..d2d34fdf 100644 Binary files a/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RxBlocking.framework/Modules/RxBlocking.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxBlocking.framework/RxBlocking b/Carthage/Build/iOS/RxBlocking.framework/RxBlocking index c5d8ad50..b8150ab2 100755 Binary files a/Carthage/Build/iOS/RxBlocking.framework/RxBlocking and b/Carthage/Build/iOS/RxBlocking.framework/RxBlocking differ diff --git a/Carthage/Build/iOS/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa b/Carthage/Build/iOS/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa index a1877a47..c828b2dd 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa and b/Carthage/Build/iOS/RxCocoa.framework.dSYM/Contents/Resources/DWARF/RxCocoa differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Headers/RxCocoa-Swift.h b/Carthage/Build/iOS/RxCocoa.framework/Headers/RxCocoa-Swift.h index 1723f3bd..3e9de56e 100644 --- a/Carthage/Build/iOS/RxCocoa.framework/Headers/RxCocoa-Swift.h +++ b/Carthage/Build/iOS/RxCocoa.framework/Headers/RxCocoa-Swift.h @@ -4,7 +4,7 @@ #if TARGET_OS_SIMULATOR #if 0 #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -309,7 +309,7 @@ SWIFT_CLASS("_TtC7RxCocoa35_RxTableViewReactiveArrayDataSource") #pragma clang diagnostic pop #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -618,7 +618,7 @@ SWIFT_CLASS("_TtC7RxCocoa35_RxTableViewReactiveArrayDataSource") #else #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -923,7 +923,7 @@ SWIFT_CLASS("_TtC7RxCocoa35_RxTableViewReactiveArrayDataSource") #pragma clang diagnostic pop #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" diff --git a/Carthage/Build/iOS/RxCocoa.framework/Info.plist b/Carthage/Build/iOS/RxCocoa.framework/Info.plist index de6487f7..b312f71b 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Info.plist and b/Carthage/Build/iOS/RxCocoa.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftdoc index 9e0d8838..88ff449a 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftmodule index 9005123b..927aabe3 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftdoc index c560ecd8..3a0b9f50 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftmodule index a532aced..eb44a9a4 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftdoc index c560ecd8..3a0b9f50 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftmodule index a532aced..eb44a9a4 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftdoc index 9e0d8838..88ff449a 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftmodule index 9005123b..927aabe3 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftdoc index 9e0d8838..88ff449a 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftmodule index 9005123b..927aabe3 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/armv7.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftdoc index b4b6374c..03e89205 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftmodule index 9594d75f..8e417243 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftdoc index b4b6374c..03e89205 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftmodule index 9594d75f..8e417243 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 9235ef98..5dea23e4 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftmodule index b97b5c76..ace78665 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftdoc index 9235ef98..5dea23e4 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftmodule index b97b5c76..ace78665 100644 Binary files a/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RxCocoa.framework/Modules/RxCocoa.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxCocoa.framework/RxCocoa b/Carthage/Build/iOS/RxCocoa.framework/RxCocoa index 36294232..5b9cb78d 100755 Binary files a/Carthage/Build/iOS/RxCocoa.framework/RxCocoa and b/Carthage/Build/iOS/RxCocoa.framework/RxCocoa differ diff --git a/Carthage/Build/iOS/RxRelay.framework.dSYM/Contents/Resources/DWARF/RxRelay b/Carthage/Build/iOS/RxRelay.framework.dSYM/Contents/Resources/DWARF/RxRelay index 4b168c54..62028d50 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework.dSYM/Contents/Resources/DWARF/RxRelay and b/Carthage/Build/iOS/RxRelay.framework.dSYM/Contents/Resources/DWARF/RxRelay differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Headers/RxRelay-Swift.h b/Carthage/Build/iOS/RxRelay.framework/Headers/RxRelay-Swift.h index f0deb18d..82da6060 100644 --- a/Carthage/Build/iOS/RxRelay.framework/Headers/RxRelay-Swift.h +++ b/Carthage/Build/iOS/RxRelay.framework/Headers/RxRelay-Swift.h @@ -4,7 +4,7 @@ #if TARGET_OS_SIMULATOR #if 0 #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -210,7 +210,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #pragma clang diagnostic pop #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -420,7 +420,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #else #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -626,7 +626,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #pragma clang diagnostic pop #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" diff --git a/Carthage/Build/iOS/RxRelay.framework/Info.plist b/Carthage/Build/iOS/RxRelay.framework/Info.plist index 1a4f44e7..b174e452 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Info.plist and b/Carthage/Build/iOS/RxRelay.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftdoc index 2a37823b..4611ac25 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftmodule index b06dbb13..2ce362f8 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftdoc index 01a4c2b3..6ca56838 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftmodule index 28eb761b..6f3d6f0b 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftdoc index 01a4c2b3..6ca56838 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftmodule index 28eb761b..6f3d6f0b 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftdoc index 2a37823b..4611ac25 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftmodule index b06dbb13..2ce362f8 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftdoc index 2a37823b..4611ac25 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftmodule index b06dbb13..2ce362f8 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/armv7.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftdoc index e0f68d9e..f2b7b69b 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftmodule index 59e1f939..d27bb109 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftdoc index e0f68d9e..f2b7b69b 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftmodule index 59e1f939..d27bb109 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index 17ec1f85..ef9f1ba6 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftmodule index 1c4ad2a1..69841bc2 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftdoc index 17ec1f85..ef9f1ba6 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftmodule index 1c4ad2a1..69841bc2 100644 Binary files a/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RxRelay.framework/Modules/RxRelay.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxRelay.framework/RxRelay b/Carthage/Build/iOS/RxRelay.framework/RxRelay index d092d79e..0109e915 100755 Binary files a/Carthage/Build/iOS/RxRelay.framework/RxRelay and b/Carthage/Build/iOS/RxRelay.framework/RxRelay differ diff --git a/Carthage/Build/iOS/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift b/Carthage/Build/iOS/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift index d7f4ae16..6a289758 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift and b/Carthage/Build/iOS/RxSwift.framework.dSYM/Contents/Resources/DWARF/RxSwift differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Headers/RxSwift-Swift.h b/Carthage/Build/iOS/RxSwift.framework/Headers/RxSwift-Swift.h index f4e69689..590a042f 100644 --- a/Carthage/Build/iOS/RxSwift.framework/Headers/RxSwift-Swift.h +++ b/Carthage/Build/iOS/RxSwift.framework/Headers/RxSwift-Swift.h @@ -4,7 +4,7 @@ #if TARGET_OS_SIMULATOR #if 0 #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -225,7 +225,7 @@ SWIFT_CLASS("_TtC7RxSwift9AtomicInt") #pragma clang diagnostic pop #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -450,7 +450,7 @@ SWIFT_CLASS("_TtC7RxSwift9AtomicInt") #else #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -671,7 +671,7 @@ SWIFT_CLASS("_TtC7RxSwift9AtomicInt") #pragma clang diagnostic pop #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" diff --git a/Carthage/Build/iOS/RxSwift.framework/Info.plist b/Carthage/Build/iOS/RxSwift.framework/Info.plist index b63d1096..d616acb4 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Info.plist and b/Carthage/Build/iOS/RxSwift.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftdoc index 5ce004ee..92a8a1a6 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftmodule index 3ce0461d..c02f9246 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftdoc index 2d511d3a..53bb7828 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftmodule index 2a141eb0..66513b6b 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftdoc index 2d511d3a..53bb7828 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftmodule index 2a141eb0..66513b6b 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftdoc index 5ce004ee..92a8a1a6 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftmodule index 3ce0461d..c02f9246 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftdoc index 5ce004ee..92a8a1a6 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftmodule index 3ce0461d..c02f9246 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/armv7.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftdoc index f31efe09..3157ee15 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftmodule index d1494c46..052b1868 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftdoc index f31efe09..3157ee15 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftmodule index d1494c46..052b1868 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index cf75044a..99a679d8 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftmodule index 99441c57..50673a7c 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftdoc index cf75044a..99a679d8 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftmodule index 99441c57..50673a7c 100644 Binary files a/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RxSwift.framework/Modules/RxSwift.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxSwift.framework/RxSwift b/Carthage/Build/iOS/RxSwift.framework/RxSwift index 869d36b8..a556feef 100755 Binary files a/Carthage/Build/iOS/RxSwift.framework/RxSwift and b/Carthage/Build/iOS/RxSwift.framework/RxSwift differ diff --git a/Carthage/Build/iOS/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest b/Carthage/Build/iOS/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest index 0fdeefb8..d443eb0a 100644 Binary files a/Carthage/Build/iOS/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest and b/Carthage/Build/iOS/RxTest.framework.dSYM/Contents/Resources/DWARF/RxTest differ diff --git a/Carthage/Build/iOS/RxTest.framework/Headers/RxTest-Swift.h b/Carthage/Build/iOS/RxTest.framework/Headers/RxTest-Swift.h index ea509720..79961661 100644 --- a/Carthage/Build/iOS/RxTest.framework/Headers/RxTest-Swift.h +++ b/Carthage/Build/iOS/RxTest.framework/Headers/RxTest-Swift.h @@ -4,7 +4,7 @@ #if TARGET_OS_SIMULATOR #if 0 #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -210,7 +210,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #pragma clang diagnostic pop #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -420,7 +420,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #else #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" @@ -626,7 +626,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #pragma clang diagnostic pop #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7) +// Generated by Apple Swift version 5.1.2 (swiftlang-1100.0.278 clang-1100.0.33.9) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wgcc-compat" diff --git a/Carthage/Build/iOS/RxTest.framework/Info.plist b/Carthage/Build/iOS/RxTest.framework/Info.plist index 676a3105..642e325d 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Info.plist and b/Carthage/Build/iOS/RxTest.framework/Info.plist differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftdoc index a3bb7403..c15bef51 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftmodule index 9f648478..704bd7fc 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftdoc index f4aeefce..8c3949b9 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftmodule index f359fe34..eebe62ef 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftdoc index f4aeefce..8c3949b9 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftmodule index f359fe34..eebe62ef 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftdoc index a3bb7403..c15bef51 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftmodule index 9f648478..704bd7fc 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7-apple-ios.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftdoc index a3bb7403..c15bef51 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftmodule index 9f648478..704bd7fc 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/armv7.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftdoc index f81d0fd1..cdbdd270 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftmodule index 38fe8d2d..028bb3cc 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftdoc index f81d0fd1..cdbdd270 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftmodule index 38fe8d2d..028bb3cc 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftdoc index ecb8f2c0..80770108 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftmodule index 34dfe582..292b3e2c 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64-apple-ios-simulator.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftdoc index ecb8f2c0..80770108 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftmodule index 34dfe582..292b3e2c 100644 Binary files a/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/RxTest.framework/Modules/RxTest.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/RxTest.framework/RxTest b/Carthage/Build/iOS/RxTest.framework/RxTest index a78ef026..223c97e3 100755 Binary files a/Carthage/Build/iOS/RxTest.framework/RxTest and b/Carthage/Build/iOS/RxTest.framework/RxTest differ diff --git a/Carthage/Build/iOS/Zip.framework.dSYM/Contents/Info.plist b/Carthage/Build/iOS/Zip.framework.dSYM/Contents/Info.plist new file mode 100644 index 00000000..6b5907dc --- /dev/null +++ b/Carthage/Build/iOS/Zip.framework.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.com.roymarmelstein.Zip + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.1.0 + CFBundleVersion + 12 + + diff --git a/Carthage/Build/iOS/Zip.framework.dSYM/Contents/Resources/DWARF/Zip b/Carthage/Build/iOS/Zip.framework.dSYM/Contents/Resources/DWARF/Zip new file mode 100644 index 00000000..610c8543 Binary files /dev/null and b/Carthage/Build/iOS/Zip.framework.dSYM/Contents/Resources/DWARF/Zip differ diff --git a/QuantiLogger.xcodeproj/project.pbxproj b/QuantiLogger.xcodeproj/project.pbxproj index 409e2a72..d93b0695 100644 --- a/QuantiLogger.xcodeproj/project.pbxproj +++ b/QuantiLogger.xcodeproj/project.pbxproj @@ -3,11 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ - 5B152C7D234CDA7D006FAF97 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B152C7C234CDA7D006FAF97 /* RxCocoa.framework */; }; + 5B07491423A0F46B00887C7C /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B07490B23A0F2A100887C7C /* RxSwift.framework */; }; + 5B07491523A0F46B00887C7C /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5B07490B23A0F2A100887C7C /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 5B16551B1EE585E0000D4652 /* SystemLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B16551A1EE585E0000D4652 /* SystemLogger.swift */; }; 5B1E989E20974F9000855C80 /* MetaInformationLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1E989D20974F9000855C80 /* MetaInformationLogger.swift */; }; 5B1E989F20976BD800855C80 /* MetaInformationLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1E989D20974F9000855C80 /* MetaInformationLogger.swift */; }; @@ -19,10 +20,7 @@ 5B3641A31DBFAC810034EF68 /* Level.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B3641A21DBFAC810034EF68 /* Level.swift */; }; 5B3641A51DBFACF90034EF68 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B3641A41DBFACF80034EF68 /* Logging.swift */; }; 5B3641A71DBFAD5D0034EF68 /* LogManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B3641A61DBFAD5D0034EF68 /* LogManager.swift */; }; - 5B4E481E20DA689A00BF2BA8 /* RxBlocking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D32E65AA20D15E3E00698F3E /* RxBlocking.framework */; }; - 5B4E482120DA68B500BF2BA8 /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B4E481F20DA68AE00BF2BA8 /* RxTest.framework */; }; 5B6B33441FF847C800CB106D /* ApplicationCallbackLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF451371FF568A500E18215 /* ApplicationCallbackLogger.swift */; }; - 5B9FCB5422D39C330099A698 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B9FCB5222D39C330099A698 /* RxCocoa.framework */; }; 5BA3645B1DD0EC160017F9EB /* FileLoggerTableViewDatasource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA3645A1DD0EC160017F9EB /* FileLoggerTableViewDatasource.swift */; }; 5BA3645D1DD0EDD10017F9EB /* LogFileRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA3645C1DD0EDD10017F9EB /* LogFileRecord.swift */; }; 5BA6AAFC226F42BA00FBB047 /* Archive+Writing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA6AAF5226F42B900FBB047 /* Archive+Writing.swift */; }; @@ -94,10 +92,13 @@ 6C5DF0CA22C0E96600271501 /* MetaInformationLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B1E989D20974F9000855C80 /* MetaInformationLogger.swift */; }; 6C5DF0CC22C0E96600271501 /* HttpMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32E659920D15A6D00698F3E /* HttpMethod.swift */; }; 6C5DF0CD22C0E96600271501 /* LogFileRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BA3645C1DD0EDD10017F9EB /* LogFileRecord.swift */; }; - 6C5DF0DC22C0EA1400271501 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CA969E822C0E681009185F6 /* RxSwift.framework */; }; 6C5DF0DD22C0EED600271501 /* ApplicationCallbackLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF451371FF568A500E18215 /* ApplicationCallbackLogger.swift */; }; 6C5DF0E322C103F600271501 /* QuantiLoggerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CA969E222C0E4FC009185F6 /* QuantiLoggerMac.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6CF70E3922CB6AA60058D080 /* LogFilesViaMailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C07CA8422CA6C730009203A /* LogFilesViaMailViewController.swift */; }; + 9C6F8ECC23A0EE170098FA4C /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C6F8ECB23A0EE170098FA4C /* RxCocoa.framework */; platformFilter = ios; }; + 9C6F8ED023A0EE240098FA4C /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C6F8ECF23A0EE240098FA4C /* RxSwift.framework */; platformFilter = ios; }; + 9C6F8ED523A0F0210098FA4C /* RxTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C6F8ED123A0EE2B0098FA4C /* RxTest.framework */; }; + 9C6F8ED723A0F02B0098FA4C /* RxRelay.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C6F8ECD23A0EE1E0098FA4C /* RxRelay.framework */; }; D32E659320D15A5C00698F3E /* WebLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32E659220D15A5C00698F3E /* WebLogger.swift */; }; D32E659E20D15A7100698F3E /* JSONParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32E659420D15A6900698F3E /* JSONParser.swift */; }; D32E659F20D15A7100698F3E /* ApiFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32E659520D15A6A00698F3E /* ApiFactory.swift */; }; @@ -109,7 +110,6 @@ D32E65A520D15A7100698F3E /* ApiError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32E659B20D15A6F00698F3E /* ApiError.swift */; }; D32E65A620D15A7100698F3E /* URLRequest+logDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32E659C20D15A7000698F3E /* URLRequest+logDescription.swift */; }; D32E65A720D15A7100698F3E /* JSONParseable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D32E659D20D15A7100698F3E /* JSONParseable.swift */; }; - D32E65AC20D15E3E00698F3E /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D32E65A920D15E3E00698F3E /* RxSwift.framework */; }; D3405D501F4C494200A1987F /* DateHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3405D4F1F4C494200A1987F /* DateHelper.swift */; }; D3A03D141F4AD5D300B0F50C /* QuantiLoggerPerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3A03D131F4AD5D300B0F50C /* QuantiLoggerPerformanceTests.swift */; }; /* End PBXBuildFile section */ @@ -131,8 +131,22 @@ }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 5B07491223A0F36200887C7C /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 5B07491523A0F46B00887C7C /* RxSwift.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 5B152C7C234CDA7D006FAF97 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = SOURCE_ROOT; }; + 5B07490B23A0F2A100887C7C /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = SOURCE_ROOT; }; 5B16551A1EE585E0000D4652 /* SystemLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemLogger.swift; sourceTree = ""; }; 5B1E989D20974F9000855C80 /* MetaInformationLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MetaInformationLogger.swift; sourceTree = ""; }; 5B2782511DC9F72A00525431 /* FileLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileLogger.swift; sourceTree = ""; }; @@ -146,8 +160,6 @@ 5B3641A21DBFAC810034EF68 /* Level.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Level.swift; path = common/Level.swift; sourceTree = ""; }; 5B3641A41DBFACF80034EF68 /* Logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = ""; }; 5B3641A61DBFAD5D0034EF68 /* LogManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LogManager.swift; path = common/LogManager.swift; sourceTree = ""; }; - 5B4E481F20DA68AE00BF2BA8 /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/iOS/RxTest.framework; sourceTree = SOURCE_ROOT; }; - 5B9FCB5222D39C330099A698 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/Mac/RxCocoa.framework; sourceTree = SOURCE_ROOT; }; 5BA3645A1DD0EC160017F9EB /* FileLoggerTableViewDatasource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileLoggerTableViewDatasource.swift; sourceTree = ""; }; 5BA3645C1DD0EDD10017F9EB /* LogFileRecord.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogFileRecord.swift; sourceTree = ""; }; 5BA6AAF5226F42B900FBB047 /* Archive+Writing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Archive+Writing.swift"; sourceTree = ""; }; @@ -176,7 +188,12 @@ 6C5DF0D722C0E96600271501 /* QuantiLoggerMac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = QuantiLoggerMac.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6CA969E222C0E4FC009185F6 /* QuantiLoggerMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = QuantiLoggerMac.h; path = mac/QuantiLoggerMac.h; sourceTree = ""; }; 6CA969E322C0E4FC009185F6 /* InfoMac.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = InfoMac.plist; path = mac/InfoMac.plist; sourceTree = ""; }; - 6CA969E822C0E681009185F6 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = SOURCE_ROOT; }; + 9C6F8EC923A0EE0F0098FA4C /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = SOURCE_ROOT; }; + 9C6F8ECB23A0EE170098FA4C /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = SOURCE_ROOT; }; + 9C6F8ECD23A0EE1E0098FA4C /* RxRelay.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxRelay.framework; path = Carthage/Build/iOS/RxRelay.framework; sourceTree = SOURCE_ROOT; }; + 9C6F8ECF23A0EE240098FA4C /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = SOURCE_ROOT; }; + 9C6F8ED123A0EE2B0098FA4C /* RxTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxTest.framework; path = Carthage/Build/iOS/RxTest.framework; sourceTree = SOURCE_ROOT; }; + 9C6F8ED323A0EE300098FA4C /* RxAtomic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxAtomic.framework; path = Carthage/Build/iOS/RxAtomic.framework; sourceTree = SOURCE_ROOT; }; D32E659220D15A5C00698F3E /* WebLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebLogger.swift; sourceTree = ""; }; D32E659420D15A6900698F3E /* JSONParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONParser.swift; sourceTree = ""; }; D32E659520D15A6A00698F3E /* ApiFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApiFactory.swift; sourceTree = ""; }; @@ -188,8 +205,6 @@ D32E659B20D15A6F00698F3E /* ApiError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ApiError.swift; sourceTree = ""; }; D32E659C20D15A7000698F3E /* URLRequest+logDescription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URLRequest+logDescription.swift"; sourceTree = ""; }; D32E659D20D15A7100698F3E /* JSONParseable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONParseable.swift; sourceTree = ""; }; - D32E65A920D15E3E00698F3E /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = SOURCE_ROOT; }; - D32E65AA20D15E3E00698F3E /* RxBlocking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxBlocking.framework; path = Carthage/Build/iOS/RxBlocking.framework; sourceTree = SOURCE_ROOT; }; D3405D4F1F4C494200A1987F /* DateHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateHelper.swift; sourceTree = ""; }; D3A03D131F4AD5D300B0F50C /* QuantiLoggerPerformanceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuantiLoggerPerformanceTests.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -199,8 +214,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5B152C7D234CDA7D006FAF97 /* RxCocoa.framework in Frameworks */, - D32E65AC20D15E3E00698F3E /* RxSwift.framework in Frameworks */, + 9C6F8ED023A0EE240098FA4C /* RxSwift.framework in Frameworks */, + 9C6F8ECC23A0EE170098FA4C /* RxCocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -208,9 +223,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 9C6F8ED523A0F0210098FA4C /* RxTest.framework in Frameworks */, 5B27824A1DC9F1AD00525431 /* QuantiLogger.framework in Frameworks */, - 5B4E481E20DA689A00BF2BA8 /* RxBlocking.framework in Frameworks */, - 5B4E482120DA68B500BF2BA8 /* RxTest.framework in Frameworks */, + 9C6F8ED723A0F02B0098FA4C /* RxRelay.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -232,8 +247,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5B9FCB5422D39C330099A698 /* RxCocoa.framework in Frameworks */, - 6C5DF0DC22C0EA1400271501 /* RxSwift.framework in Frameworks */, + 5B07491423A0F46B00887C7C /* RxSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -452,13 +466,14 @@ D3920BE7206D2BAE0054FE9F /* Frameworks */ = { isa = PBXGroup; children = ( - 5B9FCB5222D39C330099A698 /* RxCocoa.framework */, - 5B152C7C234CDA7D006FAF97 /* RxCocoa.framework */, - 6CA969E822C0E681009185F6 /* RxSwift.framework */, - D32E65A920D15E3E00698F3E /* RxSwift.framework */, + 5B07490B23A0F2A100887C7C /* RxSwift.framework */, + 9C6F8ED323A0EE300098FA4C /* RxAtomic.framework */, + 9C6F8ED123A0EE2B0098FA4C /* RxTest.framework */, + 9C6F8ECF23A0EE240098FA4C /* RxSwift.framework */, + 9C6F8ECD23A0EE1E0098FA4C /* RxRelay.framework */, + 9C6F8ECB23A0EE170098FA4C /* RxCocoa.framework */, + 9C6F8EC923A0EE0F0098FA4C /* RxBlocking.framework */, 5BA6AAF4226F429400FBB047 /* Zip */, - 5B4E481F20DA68AE00BF2BA8 /* RxTest.framework */, - D32E65AA20D15E3E00698F3E /* RxBlocking.framework */, ); name = Frameworks; path = Zip; @@ -543,6 +558,7 @@ isa = PBXNativeTarget; buildConfigurationList = 5BF957241F5ECF1D00F88F9B /* Build configuration list for PBXNativeTarget "QuantiLoggerExample" */; buildPhases = ( + 9C30BA1B239EA7280046008F /* ShellScript */, 5BF956FB1F5ECF1C00F88F9B /* Sources */, 5BF956FC1F5ECF1C00F88F9B /* Frameworks */, 5BF956FD1F5ECF1C00F88F9B /* Resources */, @@ -583,6 +599,7 @@ 6C5DF0CE22C0E96600271501 /* Frameworks */, 6C5DF0D122C0E96600271501 /* Headers */, 6C5DF0D322C0E96600271501 /* Resources */, + 5B07491223A0F36200887C7C /* Embed Frameworks */, ); buildRules = ( ); @@ -617,7 +634,7 @@ }; 5BF956FE1F5ECF1C00F88F9B = { CreatedOnToolsVersion = 8.3.3; - DevelopmentTeam = 2PY9RKK8A7; + DevelopmentTeam = 8JH59DJ45H; LastSwiftMigration = 0900; ProvisioningStyle = Automatic; }; @@ -706,7 +723,24 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n swiftlint\n echo \"Hi\"\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; + shellScript = "if which swiftlint >/dev/null; then\n swiftlint autocorrect\n echo \"Hi\"\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; + }; + 9C30BA1B239EA7280046008F /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if which swiftlint >/dev/null; then\n swiftlint autocorrect\n echo \"Hi\"\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; }; D3405D511F4C7CB700A1987F /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -719,7 +753,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n swiftlint\n echo \"Hi\"\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; + shellScript = "if which swiftlint >/dev/null; then\n swiftlint autocorrect\n echo \"Hi\"\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -874,6 +908,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + B = ""; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -937,6 +972,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + B = ""; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -980,7 +1016,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VALID_ARCHS = "arm64 armv7 armv7s x86_64 i386"; @@ -992,6 +1029,7 @@ 5B36419D1DBFA4650034EF68 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1006,7 +1044,11 @@ ); INFOPLIST_FILE = QuantiLogger/ios/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.quanti.swift.QuantiLogger; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1021,6 +1063,7 @@ 5B36419E1DBFA4650034EF68 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1035,7 +1078,11 @@ ); INFOPLIST_FILE = QuantiLogger/ios/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.quanti.swift.QuantiLogger; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1055,7 +1102,12 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = QuantiLoggerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "$(FRAMEWORK_SEARCH_PATHS)", + ); PRODUCT_BUNDLE_IDENTIFIER = com.quanti.swift.QuantiLoggerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1072,7 +1124,12 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); INFOPLIST_FILE = QuantiLoggerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + "$(FRAMEWORK_SEARCH_PATHS)", + ); PRODUCT_BUNDLE_IDENTIFIER = com.quanti.swift.QuantiLoggerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1084,10 +1141,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - DEVELOPMENT_TEAM = 2PY9RKK8A7; + DEVELOPMENT_TEAM = 8JH59DJ45H; INFOPLIST_FILE = QuantiLoggerExample/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.quanti.QuantiLoggerExample; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -1100,10 +1160,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - DEVELOPMENT_TEAM = 2PY9RKK8A7; + DEVELOPMENT_TEAM = 8JH59DJ45H; INFOPLIST_FILE = QuantiLoggerExample/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.quanti.QuantiLoggerExample; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; @@ -1117,9 +1180,17 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; DEVELOPMENT_TEAM = 2PY9RKK8A7; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); INFOPLIST_FILE = QuantiLoggerExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.quanti.QuantiLoggerExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1133,9 +1204,17 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; DEVELOPMENT_TEAM = 2PY9RKK8A7; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); INFOPLIST_FILE = QuantiLoggerExampleUITests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.quanti.QuantiLoggerExampleUITests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1146,6 +1225,7 @@ 6C5DF0D522C0E96600271501 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1154,10 +1234,17 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/Mac"; + FRAMEWORK_SEARCH_PATHS = ( + "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); INFOPLIST_FILE = QuantiLogger/mac/InfoMac.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.12; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.quanti.swift.QuantiLoggerMac; @@ -1174,6 +1261,7 @@ 6C5DF0D622C0E96600271501 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + BUILD_LIBRARY_FOR_DISTRIBUTION = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1182,10 +1270,17 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/Mac"; + FRAMEWORK_SEARCH_PATHS = ( + "$(PROJECT_DIR)/Carthage/Build/Mac", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); INFOPLIST_FILE = QuantiLogger/mac/InfoMac.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.quanti.swift.QuantiLoggerMac; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/QuantiLogger/common/BaseApi.swift b/QuantiLogger/common/BaseApi.swift index d8af212a..9d95c983 100644 --- a/QuantiLogger/common/BaseApi.swift +++ b/QuantiLogger/common/BaseApi.swift @@ -15,7 +15,7 @@ class BaseApi: NSObject { required init?(url: String) { guard let _url = URL(string: url) else { - print("\(#function) - could not create an URL instance out of provided URL string.") + print("\(#function) - could not create an URL instance out of provided URL string: \(url)") return nil } diff --git a/QuantiLogger/common/FileLoggerManager.swift b/QuantiLogger/common/FileLoggerManager.swift index effe3a4b..befb6002 100644 --- a/QuantiLogger/common/FileLoggerManager.swift +++ b/QuantiLogger/common/FileLoggerManager.swift @@ -86,54 +86,53 @@ class FileLoggerManager { } } - // Url of the zip file containing all log files. - var archivedLogFilesUrl: URL? { - guard let _logDirUrl = logDirUrl else { - print("\(#function) - logDirUrl is nil.") - return nil - } - - let archiveUrl = _logDirUrl.appendingPathComponent("log_files_archive.zip") - - guard let allLogFiles = gettingAllLogFiles(), allLogFiles.count > 0 else { - print("\(#function) - no log files.") - return nil - } - - // Remove old archive if exists - do { - try FileManager.default.removeItem(at: archiveUrl) - } catch let error { - print("\(#function) - failed to remove old archive file with error \(error).") - } - - // Create new archive - guard Archive(url: archiveUrl, accessMode: .create) != nil else { - print("\(#function) - failed to create the archive.") - return nil - } - - // Open newly created archive for update - guard let archive = Archive(url: archiveUrl, accessMode: .update) else { - print("\(#function) - failed to open the archive for update.") - return nil - } - - // Add all log files to the archive - do { - try allLogFiles.forEach { logFileUrl in - var logFileUrlVar = logFileUrl - logFileUrlVar.deleteLastPathComponent() - - try archive.addEntry(with: logFileUrl.lastPathComponent, relativeTo: logFileUrlVar) - } - } catch let error { - print("\(#function) - failed to add a log file to the archive with error \(error).") - return nil - } - - return archive.url - } + // Url of the zip file containing all log files. + var archivedLogFilesUrl: URL? { + guard let _logDirUrl = logDirUrl else { + print("\(#function) - logDirUrl is nil.") + return nil + } + + let archiveUrl = _logDirUrl.appendingPathComponent("log_files_archive.zip") + + guard let allLogFiles = gettingAllLogFiles(), allLogFiles.count > 0 else { + print("\(#function) - no log files.") + return nil + } + + // Remove old archive if exists + do { + try FileManager.default.removeItem(at: archiveUrl) + } catch let error { + print("\(#function) - failed to remove old archive file with error \(error).") + } + + // Create new archive + guard Archive(url: archiveUrl, accessMode: .create) != nil else { + print("\(#function) - failed to create the archive.") + return nil + } + + // Open newly created archive for update + guard let archive = Archive(url: archiveUrl, accessMode: .update) else { + print("\(#function) - failed to open the archive for update.") + return nil + } + + // Add all log files to the archive + do { + try allLogFiles.forEach { logFileUrl in + var logFileUrlVar = logFileUrl + logFileUrlVar.deleteLastPathComponent() + try archive.addEntry(with: logFileUrl.lastPathComponent, relativeTo: logFileUrlVar, compressionMethod: .deflate) + } + } catch let error { + print("\(#function) - failed to add a log file to the archive with error \(error).") + return nil + } + + return archive.url + } private init() { if let _dateOfLastLog = UserDefaults.standard.object(forKey: QuantiLoggerConstants.UserDefaultsKeys.dateOfLastLog) as? Date { @@ -155,7 +154,7 @@ class FileLoggerManager { } } - /// Method to reset properties that control the correct flow of storing log files. + /// Method to reset properties that control the correct flow of storing log files. /// - "currentLogFileNumber" represents the current logging file number /// - "dateTimeOfLastLog" represents the last date the logger was used /// - "numOfLogFiles" represents the number of files that are used for logging, can be set by a user @@ -236,7 +235,6 @@ class FileLoggerManager { let logFiles = directoryContent.filter({ (file) -> Bool in file.pathExtension == "log" }) - return logFiles } catch let error { assertionFailure("Failed to get log directory content with error: \(error).") @@ -267,7 +265,7 @@ class FileLoggerManager { } } - /// Method to refresh/set "currentLogFileNumber" and "dateTimeOfLastLog" properties. It is called at the beginning + /// Method to refresh/set "currentLogFileNumber" and "dateTimeOfLastLog" properties. It is called at the beginning /// of writeToLogFile(_, _) method. private func refreshCurrentLogFileStatus() { let currentDate = Date() diff --git a/QuantiLogger/common/WebLogger.swift b/QuantiLogger/common/WebLogger.swift index f45e0e08..4baac0ea 100644 --- a/QuantiLogger/common/WebLogger.swift +++ b/QuantiLogger/common/WebLogger.swift @@ -76,10 +76,13 @@ public class WebLogger: Logging { private let bag = DisposeBag() public init(serverUrl: String = WebLogger.defaultServerUrl, + apiPath: String = "/api/v1", sessionName: String = UUID().uuidString, sizeOfBatch: Int = 5, timeSpan: RxTimeInterval = .seconds(4)) { - self.api = WebLoggerApi(url: serverUrl) + + let serverUrlHasScheme = serverUrl.starts(with: "http://") || serverUrl.starts(with: "https://") + self.api = WebLoggerApi(url: (serverUrlHasScheme ? "" : "http://") + serverUrl + apiPath) self.sessionName = sessionName self.sizeOfBatch = sizeOfBatch self.timeSpan = timeSpan @@ -107,7 +110,7 @@ public class WebLogger: Logging { open func log(_ message: String, onLevel level: Level) { //do some fancy logging - let entry = LogEntry(level: level, timestamp: NSDate().timeIntervalSince1970, message: message, sessionName: sessionName) + let entry = LogEntry(level: level, timestamp: Date().timeIntervalSince1970 * 1000, message: message, sessionName: sessionName) logSubject.onNext(entry) } } diff --git a/QuantiLogger/common/Zip/Archive+Reading.swift b/QuantiLogger/common/Zip/Archive+Reading.swift index 39f57eb1..a524c727 100755 --- a/QuantiLogger/common/Zip/Archive+Reading.swift +++ b/QuantiLogger/common/Zip/Archive+Reading.swift @@ -104,7 +104,7 @@ extension Archive { progress: Progress? = nil, with consumer: Consumer) throws -> CRC32 { let size = Int(entry.centralDirectoryStructure.uncompressedSize) return try Data.consumePart(of: size, chunkSize: Int(bufferSize), provider: { (_, chunkSize) -> Data in - return try Data.readChunk(of: Int(chunkSize), from: self.archiveFile) + try Data.readChunk(of: Int(chunkSize), from: self.archiveFile) }, consumer: { (data) in if progress?.isCancelled == true { throw ArchiveError.cancelledOperation } try consumer(data) @@ -116,7 +116,7 @@ extension Archive { progress: Progress? = nil, with consumer: Consumer) throws -> CRC32 { let size = Int(entry.centralDirectoryStructure.compressedSize) return try Data.decompress(size: size, bufferSize: Int(bufferSize), provider: { (_, chunkSize) -> Data in - return try Data.readChunk(of: chunkSize, from: self.archiveFile) + try Data.readChunk(of: chunkSize, from: self.archiveFile) }, consumer: { (data) in if progress?.isCancelled == true { throw ArchiveError.cancelledOperation } try consumer(data) diff --git a/QuantiLogger/common/Zip/Archive+Writing.swift b/QuantiLogger/common/Zip/Archive+Writing.swift index df592ca5..b60116fd 100755 --- a/QuantiLogger/common/Zip/Archive+Writing.swift +++ b/QuantiLogger/common/Zip/Archive+Writing.swift @@ -48,13 +48,13 @@ extension Archive { throw CocoaError(.fileNoSuchFile) } defer { fclose(entryFile) } - provider = { _, _ in return try Data.readChunk(of: Int(bufferSize), from: entryFile) } + provider = { _, _ in try Data.readChunk(of: Int(bufferSize), from: entryFile) } try self.addEntry(with: path, type: type, uncompressedSize: uncompressedSize, modificationDate: modDate, permissions: permissions, compressionMethod: compressionMethod, bufferSize: bufferSize, progress: progress, provider: provider) case .directory: - provider = { _, _ in return Data() } + provider = { _, _ in Data() } try self.addEntry(with: path.hasSuffix("/") ? path : path + "/", type: type, uncompressedSize: uncompressedSize, modificationDate: modDate, permissions: permissions, @@ -160,7 +160,7 @@ extension Archive { let entryStart = Int(currentEntry.centralDirectoryStructure.relativeOffsetOfLocalHeader) fseek(self.archiveFile, entryStart, SEEK_SET) let provider: Provider = { (_, chunkSize) -> Data in - return try Data.readChunk(of: Int(chunkSize), from: self.archiveFile) + try Data.readChunk(of: Int(chunkSize), from: self.archiveFile) } let consumer: Consumer = { if progress?.isCancelled == true { throw ArchiveError.cancelledOperation } diff --git a/QuantiLogger/common/Zip/Data+Serialization.swift b/QuantiLogger/common/Zip/Data+Serialization.swift index cdc7a784..be42844b 100755 --- a/QuantiLogger/common/Zip/Data+Serialization.swift +++ b/QuantiLogger/common/Zip/Data+Serialization.swift @@ -37,7 +37,7 @@ extension Data { return nil } let structure = T(data: data, additionalDataProvider: { (additionalDataSize) -> Data in - return try self.readChunk(of: additionalDataSize, from: file) + try self.readChunk(of: additionalDataSize, from: file) }) return structure } diff --git a/QuantiLoggerExample/SendLogFilesViaMailViewController.swift b/QuantiLoggerExample/SendLogFilesViaMailViewController.swift index 9ce64a9b..3bcdb80f 100644 --- a/QuantiLoggerExample/SendLogFilesViaMailViewController.swift +++ b/QuantiLoggerExample/SendLogFilesViaMailViewController.swift @@ -16,7 +16,6 @@ class SendLogFilesViaMailViewController: UIViewController { view.backgroundColor = .white - if MFMailComposeViewController.canSendMail() { let logFilesViaMailViewController = LogFilesViaMailViewController(withRecipients: ["xxx@xxx.xx"]) logFilesViaMailViewController.mailComposeDelegate = self diff --git a/README.md b/README.md index 60776695..03bf2e11 100644 --- a/README.md +++ b/README.md @@ -118,15 +118,15 @@ Here is an example of log batch in JSON: [{"severity": "VERBOSE", "sessionName": "E598B4C1-2B08-4563-81C0-2A77E5CE0C3C", "message":"/some/path/QuantiLoggerTests.swift - testWebLogger() - line 165: Test verbose", - "timestamp": 1529668897.318845}, + "timestamp": 1529668897318.845}, {"severity": "INFO", "sessionName":"E598B4C1-2B08-4563-81C0-2A77E5CE0C3C", "message": "/some/path/QuantiLoggerTests.swift - testWebLogger() - line 166: Test system", - "timestamp":1529668897.3196549}, + "timestamp":1529668897319.6549}, {"severity":"INFO", "sessionName":"E598B4C1-2B08-4563-81C0-2A77E5CE0C3C", "message":"/some/path/QuantiLoggerTests.swift - testWebLogger() - line 167: Test process", - "timestamp":1529668897.3196959 + "timestamp":1529668897319.6959 }] ```