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 /cpp/test/ios | |
| 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 'cpp/test/ios')
5 files changed, 9 insertions, 8 deletions
diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj index 89d6f143f07..b1bdd56fb07 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj @@ -67,7 +67,7 @@ "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).cpp", "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h", ); - script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper --cpp"; + script = "#export ICE_BIN_DIST=all\n../../../../scripts/ice-builder-xcode-wrapper --cpp\n"; }; /* End PBXBuildRule section */ @@ -343,7 +343,7 @@ 14905C491DF98FD8002AE61B /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = "ZeroC, Inc."; TargetAttributes = { 1440D86B1E0186FF00CF7ED3 = { @@ -366,10 +366,9 @@ }; buildConfigurationList = 14905C4C1DF98FD8002AE61B /* Build configuration list for PBXProject "C++ Test Controller" */; compatibilityVersion = "Xcode 8.0"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( - English, en, Base, ); @@ -678,6 +677,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++"; @@ -729,6 +729,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/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 Test Controller.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 Test Controller.xcscheme index 4260c72ba70..2c2f225d205 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 Test Controller.xcscheme +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++11 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/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 Test Controller.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 Test Controller.xcscheme index 0eb047b757a..6d757f629e9 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 Test Controller.xcscheme +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/C++98 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/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.xcscheme index 258785bfdf8..c8accc8224b 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.xcscheme +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp11ControllerBundle.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/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme index a13c8df62eb..3b270e4d820 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/xcshareddata/xcschemes/Cpp98ControllerBundle.xcscheme @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <Scheme - LastUpgradeVersion = "0930" + LastUpgradeVersion = "1030" version = "1.3"> <BuildAction parallelizeBuildables = "YES" |