diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2015-12-10 15:49:53 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-12-10 16:40:10 -0500 |
| commit | 938ba4103934db7459a920ca0cd96f0fd3953695 (patch) | |
| tree | 94fc5e48edf2dcd9e298f4b450e016687d2ac099 /objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj | |
| parent | 2f2da0702db0aab16f473a86b28de854e5740295 (diff) | |
| download | protobuf-938ba4103934db7459a920ca0cd96f0fd3953695.tar.gz protobuf-938ba4103934db7459a920ca0cd96f0fd3953695.tar.bz2 protobuf-938ba4103934db7459a920ca0cd96f0fd3953695.zip | |
Update the min toolchain for iOS/OS X to be Xcode 7
- Let Xcode update the projects, schemes, and info.plists.
- Add workaround for shallow analyzer issues in current Xcode versions (deep analyze gets things correct).
- Tweak the Swift based tests to avoid warnings from Xcode 7's XCTest using optionals for autoenclosure results.
- No longer tag the ObjC iOS travis test as flaky, xctool seems to manage the simulator pretty well.
Diffstat (limited to 'objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj')
| -rw-r--r-- | objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj b/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj index e0a45ef6..55013641 100644 --- a/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj +++ b/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj @@ -644,8 +644,9 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { + LastSwiftUpdateCheck = 0710; LastTestingUpgradeCheck = 0600; - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0710; TargetAttributes = { 8BBEA4A5147C727100C4ADB7 = { TestTargetID = 8B9A5EA41831993600A9D33B; @@ -865,6 +866,7 @@ CLANG_ENABLE_OBJC_ARC = YES; INFOPLIST_FILE = "$(SRCROOT)/Tests/iOSTestHarness/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -879,6 +881,7 @@ CLANG_ENABLE_OBJC_ARC = YES; INFOPLIST_FILE = "$(SRCROOT)/Tests/iOSTestHarness/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 7.1; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -955,6 +958,7 @@ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; |