diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-08-21 11:20:31 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-08-21 11:20:31 +0200 |
| commit | 1981747b36411f7e7e7477ea8d25d03aae7dc568 (patch) | |
| tree | 8e0dcb749b67549af8db9194a4f9f2ce3c32a95c /objective-c | |
| parent | Fixed Rakefile issue when building Swift tests against bindist, fixes #489 (diff) | |
| download | ice-1981747b36411f7e7e7477ea8d25d03aae7dc568.tar.bz2 ice-1981747b36411f7e7e7477ea8d25d03aae7dc568.tar.xz ice-1981747b36411f7e7e7477ea8d25d03aae7dc568.zip | |
Fixed C++/Objective-C controller project warnings with Xcode 10.x
Diffstat (limited to 'objective-c')
3 files changed, 6 insertions, 5 deletions
diff --git a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj index bb0f4b1531d..2fde2bdf095 100644 --- a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj +++ b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj @@ -1204,7 +1204,7 @@ 14905C491DF98FD8002AE61B /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = "ZeroC, Inc."; TargetAttributes = { 14905C501DF98FD8002AE61B = { @@ -1228,10 +1228,9 @@ }; buildConfigurationList = 14905C4C1DF98FD8002AE61B /* Build configuration list for PBXProject "Objective-C Test Controller" */; compatibilityVersion = "Xcode 8.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -1652,6 +1651,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -1708,6 +1708,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C ARC Test Controller.xcscheme b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C ARC Test Controller.xcscheme index b75c0b144a4..a31438d05f0 100644 --- a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C ARC Test Controller.xcscheme +++ b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C ARC Test Controller.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0930" + LastUpgradeVersion = "1030" version = "1.3"> <BuildAction parallelizeBuildables = "YES" diff --git a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C Test Controller.xcscheme b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C Test Controller.xcscheme index 0f0163f5e49..eb8f0b0e2d3 100644 --- a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C Test Controller.xcscheme +++ b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/xcshareddata/xcschemes/Objective-C Test Controller.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0930" + LastUpgradeVersion = "1030" version = "1.3"> <BuildAction parallelizeBuildables = "YES" |