From 4cd2a94110e96c6270737ef2fd10b05d91b91540 Mon Sep 17 00:00:00 2001 From: Charlotte Tortorella Date: Fri, 29 Sep 2017 16:00:45 +1000 Subject: [PATCH] Update to Swift 4 --- ReactiveReSwift.xcodeproj/project.pbxproj | 28 +++++++++++++++++-- .../xcschemes/ReactiveReSwift-iOS.xcscheme | 4 ++- .../xcschemes/ReactiveReSwift-macOS.xcscheme | 4 ++- .../xcschemes/ReactiveReSwift-tvOS.xcscheme | 4 ++- .../ReactiveReSwift-watchOS.xcscheme | 4 ++- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/ReactiveReSwift.xcodeproj/project.pbxproj b/ReactiveReSwift.xcodeproj/project.pbxproj index 91b7bf6..2c27ef0 100644 --- a/ReactiveReSwift.xcodeproj/project.pbxproj +++ b/ReactiveReSwift.xcodeproj/project.pbxproj @@ -452,7 +452,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0810; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Benjamin Encz"; TargetAttributes = { 25DBCF361C30BF2B00D63A58 = { @@ -466,11 +466,11 @@ }; 25DBCF7A1C30C4AA00D63A58 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 25DBCF861C30C4DB00D63A58 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 625E66821C1FF97E0027C288 = { CreatedOnToolsVersion = 7.1.1; @@ -845,6 +845,8 @@ PRODUCT_NAME = ReactiveReSwift; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -865,6 +867,8 @@ PRODUCT_NAME = ReactiveReSwift; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -879,6 +883,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "reswift.github.io.ReSwift-MacTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -893,6 +899,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "reswift.github.io.ReSwift-MacTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -904,14 +912,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; @@ -945,6 +959,7 @@ PRODUCT_NAME = ReactiveReSwift; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 3.0.1; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -962,14 +977,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; @@ -996,6 +1017,7 @@ PRODUCT_NAME = ReactiveReSwift; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 3.0.1; TARGETED_DEVICE_FAMILY = "1,2"; TVOS_DEPLOYMENT_TARGET = 9.0; diff --git a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-iOS.xcscheme b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-iOS.xcscheme index 26fbb69..27c6216 100644 --- a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-iOS.xcscheme +++ b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-iOS.xcscheme @@ -1,6 +1,6 @@ @@ -56,6 +57,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-macOS.xcscheme b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-macOS.xcscheme index 679c12d..76123c2 100644 --- a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-macOS.xcscheme +++ b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-macOS.xcscheme @@ -1,6 +1,6 @@ @@ -56,6 +57,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-tvOS.xcscheme b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-tvOS.xcscheme index 302ce77..637e58f 100644 --- a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-tvOS.xcscheme +++ b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-tvOS.xcscheme @@ -1,6 +1,6 @@ @@ -56,6 +57,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-watchOS.xcscheme b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-watchOS.xcscheme index 20a0ad4..719512a 100644 --- a/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-watchOS.xcscheme +++ b/ReactiveReSwift.xcodeproj/xcshareddata/xcschemes/ReactiveReSwift-watchOS.xcscheme @@ -1,6 +1,6 @@ @@ -37,6 +38,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO"