From 6e2605e7aba1bc464b7df0106c905f37ad55066e Mon Sep 17 00:00:00 2001 From: Daniel Pereira Date: Fri, 9 Jun 2017 00:17:50 +0100 Subject: [PATCH] Convert code to swift 4 --- QueryKit.xcodeproj/project.pbxproj | 30 ++++++++++++++----- .../xcshareddata/xcschemes/QueryKit.xcscheme | 2 +- QueryKit/Predicate.swift | 18 +++++------ QueryKit/QuerySet.swift | 2 +- QueryKit/SortDescriptor.swift | 4 +-- 5 files changed, 36 insertions(+), 20 deletions(-) diff --git a/QueryKit.xcodeproj/project.pbxproj b/QueryKit.xcodeproj/project.pbxproj index bd202ab..eb17868 100644 --- a/QueryKit.xcodeproj/project.pbxproj +++ b/QueryKit.xcodeproj/project.pbxproj @@ -172,16 +172,16 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = QueryKit; TargetAttributes = { 279ED57F1BED09EB0011CA09 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 279ED5891BED09EB0011CA09 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; }; }; @@ -260,14 +260,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -312,14 +318,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -368,7 +380,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -390,7 +403,8 @@ PRODUCT_BUNDLE_IDENTIFIER = org.querykit.QueryKit; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -403,7 +417,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.querykit.QueryKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -416,7 +431,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = org.querykit.QueryKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/QueryKit.xcodeproj/xcshareddata/xcschemes/QueryKit.xcscheme b/QueryKit.xcodeproj/xcshareddata/xcschemes/QueryKit.xcscheme index 434d561..e871aa2 100644 --- a/QueryKit.xcodeproj/xcshareddata/xcschemes/QueryKit.xcscheme +++ b/QueryKit.xcodeproj/xcshareddata/xcschemes/QueryKit.xcscheme @@ -1,6 +1,6 @@ { } } -public func == (left: Attribute, right: AttributeType?) -> Predicate { +public func == (left: Attribute, right: AttributeType?) -> Predicate { return Predicate(predicate: left == right) } -public func != (left: Attribute, right: AttributeType?) -> Predicate { +public func != (left: Attribute, right: AttributeType?) -> Predicate { return Predicate(predicate: left != right) } -public func > (left: Attribute, right: AttributeType?) -> Predicate { +public func > (left: Attribute, right: AttributeType?) -> Predicate { return Predicate(predicate: left > right) } -public func >= (left: Attribute, right: AttributeType?) -> Predicate { +public func >= (left: Attribute, right: AttributeType?) -> Predicate { return Predicate(predicate: left >= right) } -public func < (left: Attribute, right: AttributeType?) -> Predicate { +public func < (left: Attribute, right: AttributeType?) -> Predicate { return Predicate(predicate: left < right) } -public func <= (left: Attribute, right: AttributeType?) -> Predicate { +public func <= (left: Attribute, right: AttributeType?) -> Predicate { return Predicate(predicate: left <= right) } -public func ~= (left: Attribute, right: AttributeType?) -> Predicate { +public func ~= (left: Attribute, right: AttributeType?) -> Predicate { return Predicate(predicate: left ~= right) } -public func << (left: Attribute, right: [AttributeType]) -> Predicate { +public func << (left: Attribute, right: [AttributeType]) -> Predicate { return Predicate(predicate: left << right) } -public func << (left: Attribute, right: Range) -> Predicate { +public func << (left: Attribute, right: Range) -> Predicate { return Predicate(predicate: left << right) } diff --git a/QueryKit/QuerySet.swift b/QueryKit/QuerySet.swift index 7ee7745..44e74ad 100644 --- a/QueryKit/QuerySet.swift +++ b/QueryKit/QuerySet.swift @@ -218,7 +218,7 @@ extension QuerySet { } /// Returns true if the two given querysets are equivilent -public func == (lhs: QuerySet, rhs: QuerySet) -> Bool { +public func == (lhs: QuerySet, rhs: QuerySet) -> Bool { let context = lhs.context == rhs.context let entityName = lhs.entityName == rhs.entityName let sortDescriptors = lhs.sortDescriptors == rhs.sortDescriptors diff --git a/QueryKit/SortDescriptor.swift b/QueryKit/SortDescriptor.swift index 96bfc25..0009367 100644 --- a/QueryKit/SortDescriptor.swift +++ b/QueryKit/SortDescriptor.swift @@ -12,12 +12,12 @@ public struct SortDescriptor { extension Attribute { /// Returns an ascending sort descriptor for the attribute - public func ascending() -> SortDescriptor { + public func ascending() -> SortDescriptor { return SortDescriptor(sortDescriptor: ascending()) } /// Returns a descending sort descriptor for the attribute - public func descending() -> SortDescriptor { + public func descending() -> SortDescriptor { return SortDescriptor(sortDescriptor: descending()) } }