diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2016-11-27 21:16:35 +0300 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-11-27 21:16:35 +0300 |
commit | 0aa924d6ed46c4fe454400ecdd9b90af3c267096 (patch) | |
tree | cec6c33b7fdba88d2facc289b68e6786e2020c5b | |
parent | e07254c95afbedc0fb2672054051583bc5ab2f90 (diff) |
Update Mumble to use Xcode 8.1's default settings.
-rw-r--r-- | BuildConfig/Base.xcconfig | 22 | ||||
-rw-r--r-- | BuildConfig/Debug.xcconfig | 4 | ||||
-rwxr-xr-x | Mumble.xcodeproj/project.pbxproj | 8 | ||||
-rw-r--r-- | Source/Info.plist | 2 | ||||
-rw-r--r-- | Tests/MumbleTests-Info.plist | 2 |
5 files changed, 25 insertions, 13 deletions
diff --git a/BuildConfig/Base.xcconfig b/BuildConfig/Base.xcconfig index 6e55891..904d2fb 100644 --- a/BuildConfig/Base.xcconfig +++ b/BuildConfig/Base.xcconfig @@ -6,11 +6,11 @@ ARCHS = armv7 arm64 SDKROOT = iphoneos MACOSX_DEPLOYMENT_TARGET = 10.7 -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer -IPHONEOS_DEPLOYMENT_TARGET = 5.0 +IPHONEOS_DEPLOYMENT_TARGET = 8.0 TARGETED_DEVICE_FAMILY = 1 // iPhone @@ -24,6 +24,23 @@ OTHER_CFLAGS = -DNS_BLOCK_ASSERTIONS=1 GCC_WARN_ABOUT_RETURN_TYPE = YES GCC_WARN_UNUSED_VARIABLE = YES +CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES +CLANG_WARN_BOOL_CONVERSION = YES +CLANG_WARN_CONSTANT_CONVERSION = YES +CLANG_WARN_EMPTY_BODY = YES +CLANG_WARN_ENUM_CONVERSION = YES +CLANG_WARN_INFINITE_RECURSION = YES +CLANG_WARN_INT_CONVERSION = YES +CLANG_WARN_SUSPICIOUS_MOVE = YES +CLANG_WARN_UNREACHABLE_CODE = YES +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +ENABLE_STRICT_OBJC_MSGSEND = YES +GCC_NO_COMMON_BLOCKS = YES +GCC_WARN_64_TO_32_BIT_CONVERSION = YES +GCC_WARN_UNDECLARED_SELECTOR = YES +GCC_WARN_UNINITIALIZED_AUTOS = YES +GCC_WARN_UNUSED_FUNCTION = YES + INFOPLIST_FILE = Source/Info.plist GCC_PRECOMPILE_PREFIX_HEADER = YES @@ -36,3 +53,4 @@ OTHER_LDFLAGS = -all_load -ObjC -lc++ ENABLE_BITCODE = NO PRODUCT_NAME = Mumble +PRODUCT_BUNDLE_IDENTIFIER = info.mumble.${PRODUCT_NAME:rfc1034identifier} diff --git a/BuildConfig/Debug.xcconfig b/BuildConfig/Debug.xcconfig index 471516b..3376bd5 100644 --- a/BuildConfig/Debug.xcconfig +++ b/BuildConfig/Debug.xcconfig @@ -6,4 +6,6 @@ COPY_PHASE_STRIP = NO -GCC_OPTIMIZATION_LEVEL = 0
\ No newline at end of file +GCC_OPTIMIZATION_LEVEL = 0 + +ENABLE_TESTABILITY = YES diff --git a/Mumble.xcodeproj/project.pbxproj b/Mumble.xcodeproj/project.pbxproj index 7e53f88..7915a97 100755 --- a/Mumble.xcodeproj/project.pbxproj +++ b/Mumble.xcodeproj/project.pbxproj @@ -1314,7 +1314,6 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1; }; @@ -1325,7 +1324,6 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1; }; @@ -1361,7 +1359,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Tests/MumbleTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -1392,7 +1389,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Tests/MumbleTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -1423,7 +1419,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Tests/MumbleTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -1454,7 +1449,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Tests/MumbleTests-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -1474,7 +1468,6 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1; }; @@ -1492,7 +1485,6 @@ buildSettings = { CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = 1; }; diff --git a/Source/Info.plist b/Source/Info.plist index 1d5f5b9..b6cf9d2 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -35,7 +35,7 @@ </dict> </dict> <key>CFBundleIdentifier</key> - <string>info.mumble.${PRODUCT_NAME:rfc1034identifier}</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> diff --git a/Tests/MumbleTests-Info.plist b/Tests/MumbleTests-Info.plist index fbab9ab..169b6f7 100644 --- a/Tests/MumbleTests-Info.plist +++ b/Tests/MumbleTests-Info.plist @@ -7,7 +7,7 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>info.mumble.${PRODUCT_NAME:rfc1034identifier}</string> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> |