From b28de3a7de9249dd886979cae4985092523b6dd1 Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Wed, 8 Jan 2020 15:15:31 +0100 Subject: [PATCH 1/3] Fixed missing include --- Sources/TTTImageTransformers.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Sources/TTTImageTransformers.h b/Sources/TTTImageTransformers.h index c4556b9..5235f48 100644 --- a/Sources/TTTImageTransformers.h +++ b/Sources/TTTImageTransformers.h @@ -21,6 +21,11 @@ // THE SOFTWARE. @import Foundation; +#if __IPHONE_OS_VERSION_MIN_REQUIRED +@import UIKit; +#elif __MAC_OS_X_VERSION_MIN_REQUIRED +@import AppKit; +#endif #import "NSValueTransformerName.h" NS_ASSUME_NONNULL_BEGIN From e7704ae79691560a0f8f0b3e39eb1e2280fc350f Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Fri, 1 Oct 2021 10:33:50 +0200 Subject: [PATCH 2/3] Updated to recommended settings for Xcode 12.5 --- TransformerKit.xcodeproj/project.pbxproj | 7 ++++--- .../xcshareddata/xcschemes/TransformerKit iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/TransformerKit macOS.xcscheme | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/TransformerKit.xcodeproj/project.pbxproj b/TransformerKit.xcodeproj/project.pbxproj index 8d1a4db..92320bf 100644 --- a/TransformerKit.xcodeproj/project.pbxproj +++ b/TransformerKit.xcodeproj/project.pbxproj @@ -230,7 +230,7 @@ BE13377B1C8CF76800117156 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1140; + LastUpgradeCheck = 1250; ORGANIZATIONNAME = Mattt; TargetAttributes = { BED5C6AD1C8CF80E00530969 = { @@ -245,10 +245,9 @@ }; buildConfigurationList = BE13377E1C8CF76800117156 /* Build configuration list for PBXProject "TransformerKit" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -333,6 +332,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -386,6 +386,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/TransformerKit.xcodeproj/xcshareddata/xcschemes/TransformerKit iOS.xcscheme b/TransformerKit.xcodeproj/xcshareddata/xcschemes/TransformerKit iOS.xcscheme index d0581df..750289f 100644 --- a/TransformerKit.xcodeproj/xcshareddata/xcschemes/TransformerKit iOS.xcscheme +++ b/TransformerKit.xcodeproj/xcshareddata/xcschemes/TransformerKit iOS.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 1 Oct 2021 10:34:05 +0200 Subject: [PATCH 3/3] Converted double quoted header includes to angled brackets --- Sources/NSValueTransformer+TransformerKit.m | 2 +- Sources/TTTCryptographyTransformers.h | 2 +- Sources/TTTCryptographyTransformers.m | 4 ++-- Sources/TTTDataTransformers.h | 2 +- Sources/TTTDataTransformers.m | 4 ++-- Sources/TTTDateTransformers.h | 2 +- Sources/TTTDateTransformers.m | 4 ++-- Sources/TTTImageTransformers.h | 2 +- Sources/TTTImageTransformers.m | 4 ++-- Sources/TTTJSONTransformer.h | 2 +- Sources/TTTJSONTransformer.m | 4 ++-- Sources/TTTStringTransformers.h | 2 +- Sources/TTTStringTransformers.m | 4 ++-- Sources/TransformerKit.h | 15 ++++++++------- 14 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Sources/NSValueTransformer+TransformerKit.m b/Sources/NSValueTransformer+TransformerKit.m index 93edec0..aaa1611 100644 --- a/Sources/NSValueTransformer+TransformerKit.m +++ b/Sources/NSValueTransformer+TransformerKit.m @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "NSValueTransformer+TransformerKit.h" +#import @import Darwin.Availability; @import ObjectiveC.runtime; diff --git a/Sources/TTTCryptographyTransformers.h b/Sources/TTTCryptographyTransformers.h index da960e5..406878f 100644 --- a/Sources/TTTCryptographyTransformers.h +++ b/Sources/TTTCryptographyTransformers.h @@ -21,7 +21,7 @@ // THE SOFTWARE. @import Foundation; -#import "NSValueTransformerName.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTCryptographyTransformers.m b/Sources/TTTCryptographyTransformers.m index 3b16f94..bb18492 100644 --- a/Sources/TTTCryptographyTransformers.m +++ b/Sources/TTTCryptographyTransformers.m @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "TTTCryptographyTransformers.h" +#import -#import "NSValueTransformer+TransformerKit.h" +#import @import CommonCrypto; diff --git a/Sources/TTTDataTransformers.h b/Sources/TTTDataTransformers.h index 5e02d06..41d56e4 100644 --- a/Sources/TTTDataTransformers.h +++ b/Sources/TTTDataTransformers.h @@ -21,7 +21,7 @@ // THE SOFTWARE. @import Foundation; -#import "NSValueTransformerName.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTDataTransformers.m b/Sources/TTTDataTransformers.m index 6a3ea34..3fe3314 100644 --- a/Sources/TTTDataTransformers.m +++ b/Sources/TTTDataTransformers.m @@ -22,9 +22,9 @@ @import Security; -#import "TTTDataTransformers.h" +#import -#import "NSValueTransformer+TransformerKit.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTDateTransformers.h b/Sources/TTTDateTransformers.h index 4e9da05..16e346e 100644 --- a/Sources/TTTDateTransformers.h +++ b/Sources/TTTDateTransformers.h @@ -21,7 +21,7 @@ // THE SOFTWARE. @import Foundation; -#import "NSValueTransformerName.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTDateTransformers.m b/Sources/TTTDateTransformers.m index ea7e19d..86fe578 100644 --- a/Sources/TTTDateTransformers.m +++ b/Sources/TTTDateTransformers.m @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "TTTDateTransformers.h" +#import -#import "NSValueTransformer+TransformerKit.h" +#import @import Darwin.C.time; @import Darwin.C.xlocale; diff --git a/Sources/TTTImageTransformers.h b/Sources/TTTImageTransformers.h index 5235f48..d0baeda 100644 --- a/Sources/TTTImageTransformers.h +++ b/Sources/TTTImageTransformers.h @@ -26,7 +26,7 @@ #elif __MAC_OS_X_VERSION_MIN_REQUIRED @import AppKit; #endif -#import "NSValueTransformerName.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTImageTransformers.m b/Sources/TTTImageTransformers.m index 45b978f..6637795 100644 --- a/Sources/TTTImageTransformers.m +++ b/Sources/TTTImageTransformers.m @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "TTTImageTransformers.h" +#import -#import "NSValueTransformer+TransformerKit.h" +#import #if __IPHONE_OS_VERSION_MIN_REQUIRED #import diff --git a/Sources/TTTJSONTransformer.h b/Sources/TTTJSONTransformer.h index ddde333..f3ce9a2 100644 --- a/Sources/TTTJSONTransformer.h +++ b/Sources/TTTJSONTransformer.h @@ -21,7 +21,7 @@ // THE SOFTWARE. @import Foundation; -#import "NSValueTransformerName.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTJSONTransformer.m b/Sources/TTTJSONTransformer.m index 38e798a..1517564 100644 --- a/Sources/TTTJSONTransformer.m +++ b/Sources/TTTJSONTransformer.m @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "TTTJSONTransformer.h" -#import "NSValueTransformer+TransformerKit.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTStringTransformers.h b/Sources/TTTStringTransformers.h index 57ba874..0366062 100644 --- a/Sources/TTTStringTransformers.h +++ b/Sources/TTTStringTransformers.h @@ -21,7 +21,7 @@ // THE SOFTWARE. @import Foundation; -#import "NSValueTransformerName.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TTTStringTransformers.m b/Sources/TTTStringTransformers.m index 14e4581..608ab64 100644 --- a/Sources/TTTStringTransformers.m +++ b/Sources/TTTStringTransformers.m @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#import "TTTStringTransformers.h" +#import -#import "NSValueTransformer+TransformerKit.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sources/TransformerKit.h b/Sources/TransformerKit.h index 4f82ba8..9284726 100644 --- a/Sources/TransformerKit.h +++ b/Sources/TransformerKit.h @@ -23,13 +23,14 @@ #ifndef _TRANSFORMER_KIT_ #define _TRANSFORMER_KIT_ - #import "TTTDateTransformers.h" - #import "TTTImageTransformers.h" - #import "TTTStringTransformers.h" - #import "TTTJSONTransformer.h" + #import + #import + #import + #import + #import #if __MAC_OS_X_VERSION_MIN_REQUIRED - #import "TTTDataTransformers.h" - #import "TTTCryptographyTransformers.h" + #import + #import #endif - #import "NSValueTransformer+TransformerKit.h" + #import #endif