From d7705818d825e1f06bddf4835f5096a66d7a49b0 Mon Sep 17 00:00:00 2001 From: DevPair36 Date: Wed, 22 May 2019 17:02:12 +0100 Subject: [PATCH] - Updated to Swift 5 - Updated SnapKit to 5.0.0 plus a bug-fix for updateConstraint with margins - Updated to recommended project settings --- Cartfile | 2 +- Cartfile.resolved | 2 +- Modular/Modular.xcodeproj/project.pbxproj | 24 +++++-------------- .../xcschemes/Modular-iOS.xcscheme | 2 +- .../xcschemes/Modular-macOS.xcscheme | 2 +- .../xcschemes/Modular-tvOS.xcscheme | 2 +- 6 files changed, 11 insertions(+), 23 deletions(-) diff --git a/Cartfile b/Cartfile index cda48e0..d5d07f9 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "SnapKit/SnapKit" "4.0.0" +github "SnapKit/SnapKit" "9ee45b354dc5eb3b088e9bb2baf37a579e1100b6" # This is 5.0.0 plus fix for issue where updateConstraint fails when constrint uses margins" diff --git a/Cartfile.resolved b/Cartfile.resolved index cda48e0..305f135 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "SnapKit/SnapKit" "4.0.0" +github "SnapKit/SnapKit" "9ee45b354dc5eb3b088e9bb2baf37a579e1100b6" diff --git a/Modular/Modular.xcodeproj/project.pbxproj b/Modular/Modular.xcodeproj/project.pbxproj index 9cd4615..dc6533f 100644 --- a/Modular/Modular.xcodeproj/project.pbxproj +++ b/Modular/Modular.xcodeproj/project.pbxproj @@ -549,7 +549,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0910; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "manGoweb UK"; TargetAttributes = { 844885341FDAB390009F5C08 = { @@ -801,7 +801,6 @@ PRODUCT_NAME = Modular; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.0; }; @@ -825,7 +824,6 @@ PRODUCT_NAME = Modular; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.0; }; @@ -834,7 +832,7 @@ 844885541FDAB497009F5C08 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -852,14 +850,13 @@ PRODUCT_NAME = Modular; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; }; name = Debug; }; 844885551FDAB497009F5C08 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; @@ -877,7 +874,6 @@ PRODUCT_NAME = Modular; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -893,7 +889,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "co.uk.mangoweb.Modular-iOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -910,7 +905,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "co.uk.mangoweb.Modular-iOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -928,7 +922,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "co.uk.mangoweb.Modular-tvOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.0; }; @@ -947,7 +940,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "co.uk.mangoweb.Modular-tvOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 10.0; }; @@ -969,7 +961,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "co.uk.mangoweb.Modular-macOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -989,7 +980,6 @@ PRODUCT_BUNDLE_IDENTIFIER = "co.uk.mangoweb.Modular-macOS-Example"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1052,7 +1042,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1109,7 +1099,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1120,7 +1110,7 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 3R8ZGADY96; @@ -1136,7 +1126,6 @@ PRODUCT_NAME = Modular; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1160,7 +1149,6 @@ PRODUCT_BUNDLE_IDENTIFIER = co.uk.mangoweb.Modular; PRODUCT_NAME = Modular; SKIP_INSTALL = YES; - SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Modular/Modular.xcodeproj/xcshareddata/xcschemes/Modular-iOS.xcscheme b/Modular/Modular.xcodeproj/xcshareddata/xcschemes/Modular-iOS.xcscheme index 29954ac..028b773 100644 --- a/Modular/Modular.xcodeproj/xcshareddata/xcschemes/Modular-iOS.xcscheme +++ b/Modular/Modular.xcodeproj/xcshareddata/xcschemes/Modular-iOS.xcscheme @@ -1,6 +1,6 @@