diff --git a/Cartfile b/Cartfile index ef7505c52..4ff667ab7 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "freshOS/Stevia" "4.5.0" +github "freshOS/Stevia" "4.6.0" github "HHK1/PryntTrimmerView" "4.0.0" diff --git a/Cartfile.resolved b/Cartfile.resolved index 8142e5418..b691b9a32 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "HHK1/PryntTrimmerView" "4.0.0" -github "freshOS/Stevia" "4.5.0" +github "freshOS/Stevia" "4.6.0" diff --git a/Carthage/Build/.Stevia.version b/Carthage/Build/.Stevia.version index 605a83caa..a0c4eb211 100644 --- a/Carthage/Build/.Stevia.version +++ b/Carthage/Build/.Stevia.version @@ -1,10 +1,23 @@ { - "commitish" : "4.5.0", + "Mac" : [ + + ], + "watchOS" : [ + + ], + "tvOS" : [ + { + "name" : "Stevia", + "hash" : "26dae9b000aabe39fa4aa24fdb220bd191f8268fa8703ea0c0e26bd2332738ab", + "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" + } + ], + "commitish" : "4.6.0", "iOS" : [ { "name" : "Stevia", - "hash" : "1252e1eeeb6aef2ae0bdc0f19a104c65b10fce50d93cc196f13f59c8a1fa38cd", - "swiftToolchainVersion" : "5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5)" + "hash" : "55ef7f86b9209f35754203721e7ec14e5f3284f7b0e829fcda58ce0664db923c", + "swiftToolchainVersion" : "5.1 (swiftlang-1100.0.270.13 clang-1100.0.33.7)" } ] } \ No newline at end of file diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Headers/PryntTrimmerView-Swift.h b/Carthage/Build/iOS/PryntTrimmerView.framework/Headers/PryntTrimmerView-Swift.h index 472093851..22ea91ebe 100644 --- a/Carthage/Build/iOS/PryntTrimmerView.framework/Headers/PryntTrimmerView-Swift.h +++ b/Carthage/Build/iOS/PryntTrimmerView.framework/Headers/PryntTrimmerView-Swift.h @@ -4,7 +4,7 @@ #if TARGET_OS_SIMULATOR #if 0 #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -116,6 +116,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -157,6 +166,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -168,6 +180,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" @@ -239,7 +254,7 @@ SWIFT_CLASS("_TtC16PryntTrimmerView13VideoCropView") #pragma clang diagnostic pop #elif defined(__i386__) && __i386__ -// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -351,6 +366,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -392,6 +416,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -403,6 +430,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" @@ -478,7 +508,7 @@ SWIFT_CLASS("_TtC16PryntTrimmerView13VideoCropView") #else #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -590,6 +620,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -631,6 +670,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -642,6 +684,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" @@ -713,7 +758,7 @@ SWIFT_CLASS("_TtC16PryntTrimmerView13VideoCropView") #pragma clang diagnostic pop #elif defined(__ARM_ARCH_7A__) && __ARM_ARCH_7A__ -// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -825,6 +870,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -866,6 +920,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -877,6 +934,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Info.plist b/Carthage/Build/iOS/PryntTrimmerView.framework/Info.plist index f2722b1d6..407cacd1e 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Info.plist and b/Carthage/Build/iOS/PryntTrimmerView.framework/Info.plist differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftdoc index ced8d8b83..222159528 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftmodule index 1950d7bda..3ef8fb5a4 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftdoc index c7f8d2e8e..7b735b065 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftmodule index 853a71814..639daa00c 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftdoc index f8ba29c3e..6cec2ad30 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftmodule index df4ce327c..3fe867862 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftdoc index 5d27d6495..c56030a43 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftmodule index 3a7fa2542..a8c1d7c1a 100644 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/PryntTrimmerView.framework/Modules/PryntTrimmerView.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/PryntTrimmerView.framework/PryntTrimmerView b/Carthage/Build/iOS/PryntTrimmerView.framework/PryntTrimmerView index b26fa74bf..dd19a5c22 100755 Binary files a/Carthage/Build/iOS/PryntTrimmerView.framework/PryntTrimmerView and b/Carthage/Build/iOS/PryntTrimmerView.framework/PryntTrimmerView differ diff --git a/Carthage/Build/iOS/Stevia.framework/Headers/Stevia-Swift.h b/Carthage/Build/iOS/Stevia.framework/Headers/Stevia-Swift.h index 165b0e1d5..c28e7686e 100644 --- a/Carthage/Build/iOS/Stevia.framework/Headers/Stevia-Swift.h +++ b/Carthage/Build/iOS/Stevia.framework/Headers/Stevia-Swift.h @@ -4,7 +4,7 @@ #if TARGET_OS_SIMULATOR #if 0 #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -116,6 +116,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -157,6 +166,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -168,6 +180,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" @@ -329,7 +344,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.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -441,6 +456,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -482,6 +506,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -493,6 +520,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" @@ -658,7 +688,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #else #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -770,6 +800,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -811,6 +850,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -822,6 +864,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" @@ -983,7 +1028,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.0.1 (swiftlang-1001.0.82.4 clang-1001.0.46.5) +// 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" @@ -1095,6 +1140,15 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # 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 @@ -1136,6 +1190,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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 @@ -1147,6 +1204,9 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #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" diff --git a/Carthage/Build/iOS/Stevia.framework/Info.plist b/Carthage/Build/iOS/Stevia.framework/Info.plist index 0359477a7..efb8a7458 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Info.plist and b/Carthage/Build/iOS/Stevia.framework/Info.plist differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftdoc b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftdoc index 0fb6a932f..b72f1b4ca 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftdoc and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftdoc differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftmodule b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftmodule index b1e14cfdc..bd9e6dea6 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftmodule and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm.swiftmodule differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftdoc b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftdoc index 57f38ce07..967437c30 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftdoc and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftdoc differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftmodule b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftmodule index 211a5a1bc..1d214793c 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftmodule and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/arm64.swiftmodule differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftdoc b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftdoc index 667023a9a..7dc84a98d 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftdoc and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftdoc differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftmodule b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftmodule index 307c99e8b..45d5bc028 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftmodule and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/i386.swiftmodule differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftdoc b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftdoc index 039049402..a2e73e1fd 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftdoc and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftdoc differ diff --git a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftmodule b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftmodule index 3fbe4b3c5..cbf81934d 100644 Binary files a/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftmodule and b/Carthage/Build/iOS/Stevia.framework/Modules/Stevia.swiftmodule/x86_64.swiftmodule differ diff --git a/Carthage/Build/iOS/Stevia.framework/Stevia b/Carthage/Build/iOS/Stevia.framework/Stevia index 50ee8b737..824aa55ea 100755 Binary files a/Carthage/Build/iOS/Stevia.framework/Stevia and b/Carthage/Build/iOS/Stevia.framework/Stevia differ diff --git a/README.md b/README.md index 441ab637d..55df34adb 100644 --- a/README.md +++ b/README.md @@ -353,3 +353,4 @@ See [LICENSE](LICENSE) for details. - Swift 4.2 -> version [**3.5.2**](https://github.com/Yummypets/YPImagePicker/releases/tag/3.5.2) releases/tag/3.4.0) - Swift 5.0 -> version [**4.0.0**](https://github.com/Yummypets/YPImagePicker/releases/tag/4.0.0) +- Swift 5.1 (Pre-release) -> version [**4.1.0**](https://github.com/Yummypets/YPImagePicker/releases/tag/4.1.0) diff --git a/Source/Helpers/Extensions/PHCachingImageManager+Extensions.swift b/Source/Helpers/Extensions/PHCachingImageManager+Extensions.swift index bb9cb5265..8b47a4b38 100644 --- a/Source/Helpers/Extensions/PHCachingImageManager+Extensions.swift +++ b/Source/Helpers/Extensions/PHCachingImageManager+Extensions.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Yummypets. All rights reserved. // -import Foundation +import UIKit import Photos extension PHCachingImageManager { diff --git a/Source/Helpers/YPPhotoSaver.swift b/Source/Helpers/YPPhotoSaver.swift index 03761605e..6d77d09ce 100644 --- a/Source/Helpers/YPPhotoSaver.swift +++ b/Source/Helpers/YPPhotoSaver.swift @@ -6,7 +6,7 @@ // Copyright © 2016 Yummypets. All rights reserved. // -import Foundation +import UIKit import Photos public class YPPhotoSaver { diff --git a/Source/Info.plist b/Source/Info.plist index 4fd7dbd2e..225e71219 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.0.1 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/YPImagePicker.framework.zip b/YPImagePicker.framework.zip index c9e5068cc..449cec3c5 100644 Binary files a/YPImagePicker.framework.zip and b/YPImagePicker.framework.zip differ diff --git a/YPImagePicker.podspec b/YPImagePicker.podspec index dce9dbd83..088c2234e 100644 --- a/YPImagePicker.podspec +++ b/YPImagePicker.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'YPImagePicker' - s.version = "4.0.1" + s.version = "4.1.0" s.summary = "Instagram-like image picker & filters for iOS" s.homepage = "https://github.com/Yummypets/YPImagePicker" s.license = { :type => "MIT", :file => "LICENSE" } @@ -12,9 +12,9 @@ Pod::Spec.new do |s| s.requires_arc = true s.ios.deployment_target = "9.0" s.source_files = 'Source/**/*.swift' - s.dependency 'SteviaLayout', '~> 4.5.0' + s.dependency 'SteviaLayout', '~> 4.6.0' s.dependency 'PryntTrimmerView', '~> 4.0.0' s.resources = ['Resources/*', 'Source/**/*.xib'] s.description = "Instagram-like image picker & filters for iOS supporting videos and albums" - s.swift_versions = ['3', '4.1', '4.2', '5.0'] + s.swift_versions = ['3', '4.1', '4.2', '5.0', '5.1'] end diff --git a/YPImagePicker.xcodeproj/project.pbxproj b/YPImagePicker.xcodeproj/project.pbxproj index 1174e55ea..3e97bab5c 100644 --- a/YPImagePicker.xcodeproj/project.pbxproj +++ b/YPImagePicker.xcodeproj/project.pbxproj @@ -500,7 +500,7 @@ 52412A8A1CA6114A0073C4BE /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1100; ORGANIZATIONNAME = Yummypets; TargetAttributes = { 52412A921CA6114A0073C4BE = { @@ -814,7 +814,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; @@ -831,6 +831,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 4.1.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -845,7 +846,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; DEFINES_MODULE = YES; @@ -862,6 +863,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 4.1.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = com.yummypets.YPImagePicker; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/YPImagePicker.xcodeproj/xcshareddata/xcschemes/YPImagePicker.xcscheme b/YPImagePicker.xcodeproj/xcshareddata/xcschemes/YPImagePicker.xcscheme index 333ab56e0..b5bc2a34f 100644 --- a/YPImagePicker.xcodeproj/xcshareddata/xcschemes/YPImagePicker.xcscheme +++ b/YPImagePicker.xcodeproj/xcshareddata/xcschemes/YPImagePicker.xcscheme @@ -1,6 +1,6 @@ - - - -