From 57a17926bac6a222e0c2eff6fbec2d71c704c0db Mon Sep 17 00:00:00 2001 From: Myron Amanatidis Date: Tue, 24 Sep 2019 22:00:31 +0100 Subject: [PATCH] Migrate to Swift 5/Xcode 10.2.x or greater --- Cartfile.private | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/Nimble | 2 +- Mixer.xcodeproj/project.pbxproj | 31 +++++++++++++++---- .../xcshareddata/xcschemes/Mixer.xcscheme | 24 ++++++-------- README.md | 10 ++++++ 6 files changed, 48 insertions(+), 23 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index 9ded752..e373088 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1 +1 @@ -github "Quick/Nimble" ~> 6.0.1 +github "Quick/Nimble" ~> 8.0.4 diff --git a/Cartfile.resolved b/Cartfile.resolved index 75181c5..a0c1c56 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "Quick/Nimble" "v6.0.1" +github "Quick/Nimble" "v8.0.4" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 8e2703f..6abeb3f 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 8e2703fabde578a6d28537c73844f84d48e71200 +Subproject commit 6abeb3f5c03beba2b9e4dbe20886e773b5b629b6 diff --git a/Mixer.xcodeproj/project.pbxproj b/Mixer.xcodeproj/project.pbxproj index bb6f092..082def5 100644 --- a/Mixer.xcodeproj/project.pbxproj +++ b/Mixer.xcodeproj/project.pbxproj @@ -220,7 +220,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1100; ORGANIZATIONNAME = "Beat Richartz"; TargetAttributes = { 53ACBF031C67AF8B0031AA49 = { @@ -235,10 +235,11 @@ }; buildConfigurationList = 53ACBEFE1C67AF8B0031AA49 /* Build configuration list for PBXProject "Mixer" */; compatibilityVersion = "Xcode 6.3"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 53ACBEFA1C67AF8B0031AA49; productRefGroup = 53ACBF051C67AF8B0031AA49 /* Products */; @@ -317,18 +318,27 @@ 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; 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_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; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -367,18 +377,27 @@ 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; 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_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; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -424,7 +443,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -444,7 +463,7 @@ PRODUCT_BUNDLE_IDENTIFIER = studio.Mixer; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -459,7 +478,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = studio.MixerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -474,7 +493,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = studio.MixerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/Mixer.xcodeproj/xcshareddata/xcschemes/Mixer.xcscheme b/Mixer.xcodeproj/xcshareddata/xcschemes/Mixer.xcscheme index 67fe34d..2e00cd9 100644 --- a/Mixer.xcodeproj/xcshareddata/xcschemes/Mixer.xcscheme +++ b/Mixer.xcodeproj/xcshareddata/xcschemes/Mixer.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -40,17 +49,6 @@ - - - - - - - - 1.1.0 +``` + For Swift 3: ```Swift github "ios-studio/Mixer" ~> 1.0.0 @@ -19,6 +24,11 @@ github "ios-studio/Mixer" ~> 0.1.2 #### Via [CocoaPods](https://cocoapods.org/): Add the following your Podfile: +For Swift 5: +```ruby +pod "Mixer", "~> 1.1.0" +``` + For Swift 3: ```ruby pod "Mixer", "~> 1.0.0"