diff options
| author | Joe George <joe@zeroc.com> | 2021-01-20 15:23:10 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-01-20 15:24:28 -0500 |
| commit | c78b8a72267dcd78ada7217f026d83c017c1d6b1 (patch) | |
| tree | 3429ae0742c91a4aba9217e57687abe5c38ddfb8 /objective-c | |
| parent | Document how to build C++ tests with a binary distribution - Close #1160 (#1252) (diff) | |
| download | ice-c78b8a72267dcd78ada7217f026d83c017c1d6b1.tar.bz2 ice-c78b8a72267dcd78ada7217f026d83c017c1d6b1.tar.xz ice-c78b8a72267dcd78ada7217f026d83c017c1d6b1.zip | |
Update Xcode projects to Xcode 12.0-compatiblev3.7.5-rc0
Diffstat (limited to 'objective-c')
3 files changed, 15 insertions, 21 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 30ed1b56967..c4775287f73 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 @@ -1210,7 +1210,7 @@ 14905C491DF98FD8002AE61B /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1030; + LastUpgradeCheck = 1230; ORGANIZATIONNAME = "ZeroC, Inc."; TargetAttributes = { 14905C501DF98FD8002AE61B = { @@ -1678,6 +1678,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; @@ -1704,7 +1705,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1736,6 +1737,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; @@ -1756,7 +1758,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -1777,7 +1779,7 @@ "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1820,7 +1822,7 @@ "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1861,7 +1863,7 @@ "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1903,7 +1905,7 @@ "../../../../sdk/$(PLATFORM_NAME).sdk/usr/include", ); INFOPLIST_FILE = Classes/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", 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 a31438d05f0..ede203f7ef6 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 = "1030" + LastUpgradeVersion = "1230" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> <MacroExpansion> <BuildableReference BuildableIdentifier = "primary" @@ -38,8 +36,8 @@ ReferencedContainer = "container:Objective-C Test Controller.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> + <Testables> + </Testables> </TestAction> <LaunchAction buildConfiguration = "Debug" @@ -61,8 +59,6 @@ ReferencedContainer = "container:Objective-C Test Controller.xcodeproj"> </BuildableReference> </BuildableProductRunnable> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Debug" 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 eb8f0b0e2d3..1bb7aa377cd 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 = "1030" + LastUpgradeVersion = "1230" version = "1.3"> <BuildAction parallelizeBuildables = "YES" @@ -27,8 +27,6 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> <MacroExpansion> <BuildableReference BuildableIdentifier = "primary" @@ -38,8 +36,8 @@ ReferencedContainer = "container:Objective-C Test Controller.xcodeproj"> </BuildableReference> </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> + <Testables> + </Testables> </TestAction> <LaunchAction buildConfiguration = "Debug" @@ -61,8 +59,6 @@ ReferencedContainer = "container:Objective-C Test Controller.xcodeproj"> </BuildableReference> </BuildableProductRunnable> - <AdditionalOptions> - </AdditionalOptions> </LaunchAction> <ProfileAction buildConfiguration = "Debug" |