From 63849f1ee0951cb417370a7bc4625d0846a69c8d Mon Sep 17 00:00:00 2001 From: Kiattisak Anoochitarom Date: Fri, 22 Jul 2016 21:10:56 +0700 Subject: [PATCH] support Swift2.3 --- Kanna.xcodeproj/project.pbxproj | 25 ++++++++++++++++++- .../xcshareddata/xcschemes/Kanna.xcscheme | 8 +++--- .../xcshareddata/xcschemes/Kanna_OSX.xcscheme | 8 +++--- .../xcschemes/Kanna_tvOS.xcscheme | 5 ++-- .../xcschemes/Kanna_watchOS.xcscheme | 5 ++-- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/Kanna.xcodeproj/project.pbxproj b/Kanna.xcodeproj/project.pbxproj index 2f946fa..fc5c328 100644 --- a/Kanna.xcodeproj/project.pbxproj +++ b/Kanna.xcodeproj/project.pbxproj @@ -677,7 +677,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0730; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = tid; TargetAttributes = { 1E206B831B665E6D00441E12 = { @@ -912,6 +912,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.tid.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -929,6 +930,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.tid.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -952,6 +955,7 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -975,6 +979,8 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 2.0; }; @@ -1032,6 +1038,7 @@ SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1081,6 +1088,7 @@ OTHER_LDFLAGS = ""; SDKROOT = iphoneos; SWIFT_INCLUDE_PATHS = "$(SRCROOT)/Modules"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1111,6 +1119,7 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -1137,6 +1146,8 @@ PRODUCT_NAME = Kanna; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -1159,6 +1170,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.tid.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -1176,6 +1188,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.tid.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -1206,6 +1220,7 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; }; name = Debug; }; @@ -1231,6 +1246,8 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; }; name = Release; }; @@ -1254,6 +1271,7 @@ SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1277,6 +1295,8 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_INCLUDE_PATHS = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1291,6 +1311,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.tid.KannaTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; + SWIFT_VERSION = 2.3; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; @@ -1303,6 +1324,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.tid.KannaTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; diff --git a/Kanna.xcodeproj/xcshareddata/xcschemes/Kanna.xcscheme b/Kanna.xcodeproj/xcshareddata/xcschemes/Kanna.xcscheme index 0880eaa..085b939 100644 --- a/Kanna.xcodeproj/xcshareddata/xcschemes/Kanna.xcscheme +++ b/Kanna.xcodeproj/xcshareddata/xcschemes/Kanna.xcscheme @@ -1,6 +1,6 @@ + buildForAnalyzing = "YES"> + buildForAnalyzing = "YES"> + buildForAnalyzing = "YES"> + buildForAnalyzing = "YES"> + buildForAnalyzing = "YES"> + buildForAnalyzing = "YES">