From d5e9fc25c56e3ea9e8a60fa7f7c16fb28000ee2e Mon Sep 17 00:00:00 2001 From: Darshan Patel Date: Thu, 21 Nov 2019 14:02:07 +0530 Subject: [PATCH 1/2] swift 5 migration --- .DS_Store | Bin 0 -> 6148 bytes Neon.xcodeproj/project.pbxproj | 22 +++++++++++------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++++ .../xcshareddata/xcschemes/Neon Demo.xcscheme | 12 +++------- .../xcshareddata/xcschemes/Neon OSX.xcscheme | 8 +------ .../xcshareddata/xcschemes/Neon iOS.xcscheme | 8 +------ .../xcschemes/NeonUnitTests.xcscheme | 8 +------ Source/NeonAlignable.swift | 12 +++++----- Source/NeonAnchorable.swift | 10 ++++---- Source/NeonGroupable.swift | 10 ++++---- 10 files changed, 44 insertions(+), 54 deletions(-) create mode 100644 .DS_Store create mode 100644 Neon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..60c2149cdb265284c64521b31de07dd4fda9125f GIT binary patch literal 6148 zcmeHK%}N6?5T3C;EC|x0$2@^he1WuVuOjr|RoWFrTC)g3kNaxk-DmJo{N_jL;zIQz zA~TSDlgUgn`@tp|BI5Z|GbNf3QH3VRq6~JXgCz{@YU5t4&$KuR6bad(AJ;v%@jXk7L@q{k$$U zz3760U?3O>27-ZaFn~K-q&hZ?J{SlFf`Ly41zIS3iNO{Qdvd?**cn=a8V-zyfD#g2Fz^cuyaUuvIFtYY literal 0 HcmV?d00001 diff --git a/Neon.xcodeproj/project.pbxproj b/Neon.xcodeproj/project.pbxproj index 92fcd2a..0ccf5d4 100644 --- a/Neon.xcodeproj/project.pbxproj +++ b/Neon.xcodeproj/project.pbxproj @@ -315,7 +315,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1110; ORGANIZATIONNAME = "Mike Amaral"; TargetAttributes = { 036A08311BBF919E000B093A = { @@ -324,7 +324,7 @@ }; 03EDD3821BBF89910006C4A9 = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1110; }; 03EDD3961BBF8A4F0006C4A9 = { CreatedOnToolsVersion = 7.1; @@ -333,14 +333,14 @@ 27D253651BAF71AB00FA4FED = { CreatedOnToolsVersion = 7.0; DevelopmentTeam = 9W3UPW3F39; - LastSwiftMigration = 0900; + LastSwiftMigration = 1110; ProvisioningStyle = Automatic; }; }; }; buildConfigurationList = 27D253611BAF71AB00FA4FED /* Build configuration list for PBXProject "Neon" */; compatibilityVersion = "Xcode 6.3"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -520,7 +520,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -550,7 +550,7 @@ PRODUCT_NAME = Neon; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -617,6 +617,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -625,12 +626,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -673,6 +676,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -681,12 +685,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -736,7 +742,7 @@ PRODUCT_NAME = Neon_Demo; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -756,7 +762,7 @@ PRODUCT_MODULE_NAME = Neon_Demo; PRODUCT_NAME = Neon_Demo; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Neon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Neon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Neon.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Neon.xcodeproj/xcshareddata/xcschemes/Neon Demo.xcscheme b/Neon.xcodeproj/xcshareddata/xcschemes/Neon Demo.xcscheme index e09261e..94199f4 100644 --- a/Neon.xcodeproj/xcshareddata/xcschemes/Neon Demo.xcscheme +++ b/Neon.xcodeproj/xcshareddata/xcschemes/Neon Demo.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - - - - - - - - - - - - - Date: Thu, 21 Nov 2019 14:27:07 +0530 Subject: [PATCH 2/2] Fix test case swift version --- .DS_Store | Bin 6148 -> 6148 bytes Neon.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.DS_Store b/.DS_Store index 60c2149cdb265284c64521b31de07dd4fda9125f..b78ffc49ec5b66a23f850254ed2267faeaf2ae59 100644 GIT binary patch delta 57 zcmZoMXffDe#mFS7Ho1UNX>uGR7pqCDn~Tfjg^bFRCouBBd4`M$n;$Z&u}y5?+sw}K GmmdJrnGnnX delta 57 zcmZoMXffDe#mK}_F}Z+IX>uGR7prmjgL4j(7cweOp1{Zh=NU2vY<|e7#x}8mZ!