From 70152a45da86241a137be2828e0c2cd2055154df Mon Sep 17 00:00:00 2001 From: AOYAMA hiroyuki Date: Wed, 9 Sep 2020 23:12:51 +0900 Subject: [PATCH] fix build error with Xcode12 (#1) * apply Xcode12 recommended settings * remove VALID_ARCHS because it's deprecated in Xcode12 --- Tests/HTTPStatusCodes.xcconfig | 7 +------ .../HTTPStatusCodes.xcodeproj/project.pbxproj | 8 +++++--- .../xcschemes/HTTPStatusCodes.xcscheme | 19 +++---------------- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/Tests/HTTPStatusCodes.xcconfig b/Tests/HTTPStatusCodes.xcconfig index 1d1eec6..c32e81b 100644 --- a/Tests/HTTPStatusCodes.xcconfig +++ b/Tests/HTTPStatusCodes.xcconfig @@ -18,11 +18,6 @@ COMBINE_HIDPI_IMAGES = YES SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator -VALID_ARCHS[sdk=iphone*] = arm64 armv7 armv7s -VALID_ARCHS[sdk=appletv*] = arm64 -VALID_ARCHS[sdk=macosx*] = i386 x86_64 -VALID_ARCHS[sdk=watch*] = armv7k - SWIFT_VERSION = 5.0 LD_RUNPATH_SEARCH_PATHS[sdk=iphone*] = $(inherited) @executable_path/Frameworks @loader_path/Frameworks @@ -39,7 +34,7 @@ INFOPLIST_FILE[sdk=watch*] = $(PROJECT_NAME)/SupportingFiles/Info-w // iOS CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -IPHONEOS_DEPLOYMENT_TARGET[sdk=iphone*] = 8.0 +IPHONEOS_DEPLOYMENT_TARGET[sdk=iphone*] = 9.0 TARGETED_DEVICE_FAMILY[sdk=iphone*] = 1,2 // tvOS diff --git a/Tests/HTTPStatusCodes.xcodeproj/project.pbxproj b/Tests/HTTPStatusCodes.xcodeproj/project.pbxproj index d75311d..ac999cb 100644 --- a/Tests/HTTPStatusCodes.xcodeproj/project.pbxproj +++ b/Tests/HTTPStatusCodes.xcodeproj/project.pbxproj @@ -203,7 +203,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Rich H"; TargetAttributes = { 440D14111A99DD1D00EEB60B = { @@ -218,11 +218,11 @@ }; buildConfigurationList = 440D140C1A99DD1D00EEB60B /* Build configuration list for PBXProject "HTTPStatusCodes" */; compatibilityVersion = "Xcode 8.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, + Base, ); mainGroup = 440D14081A99DD1D00EEB60B; productRefGroup = 440D14131A99DD1D00EEB60B /* Products */; @@ -309,6 +309,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -366,6 +367,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Tests/HTTPStatusCodes.xcodeproj/xcshareddata/xcschemes/HTTPStatusCodes.xcscheme b/Tests/HTTPStatusCodes.xcodeproj/xcshareddata/xcschemes/HTTPStatusCodes.xcscheme index f771f13..7037734 100644 --- a/Tests/HTTPStatusCodes.xcodeproj/xcshareddata/xcschemes/HTTPStatusCodes.xcscheme +++ b/Tests/HTTPStatusCodes.xcodeproj/xcshareddata/xcschemes/HTTPStatusCodes.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES"> @@ -54,17 +54,6 @@ - - - - - - - -