From bfed0a6b2c61d2051655e5f27afa84a630f3fb97 Mon Sep 17 00:00:00 2001 From: Brennan Stehling Date: Fri, 11 Dec 2020 10:38:07 -0800 Subject: [PATCH] Update Xcode project to Swift 5.0 (#291) * enables `CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER` * updates Xcode version to 12.2 --- CHANGELOG.md | 3 ++- Yams.xcodeproj/project.pbxproj | 8 +++++--- Yams.xcodeproj/xcshareddata/xcschemes/Yams.xcscheme | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3131f5..39e23a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ ##### Enhancements -* None. +* Update Xcode project from Swift 4.2 to 5.0. +* Enable `CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER` ##### Bug Fixes diff --git a/Yams.xcodeproj/project.pbxproj b/Yams.xcodeproj/project.pbxproj index fe344ed..1f8c5fd 100644 --- a/Yams.xcodeproj/project.pbxproj +++ b/Yams.xcodeproj/project.pbxproj @@ -291,7 +291,7 @@ OBJ_1 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1220; TargetAttributes = { OBJ_45 = { LastSwiftMigration = 1100; @@ -414,6 +414,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -442,7 +443,7 @@ SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -465,6 +466,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -490,7 +492,7 @@ SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; diff --git a/Yams.xcodeproj/xcshareddata/xcschemes/Yams.xcscheme b/Yams.xcodeproj/xcshareddata/xcschemes/Yams.xcscheme index 1ef952e..20152ef 100644 --- a/Yams.xcodeproj/xcshareddata/xcschemes/Yams.xcscheme +++ b/Yams.xcodeproj/xcshareddata/xcschemes/Yams.xcscheme @@ -1,6 +1,6 @@